r7116 - dumbhippo/trunk/server/src/com/dumbhippo/dm/fetch

[commits mugshot org]

Author: otaylor
Date: 2007-12-21 13:27:18 -0600 (Fri, 21 Dec 2007)
New Revision: 7116

Modified:
   dumbhippo/trunk/server/src/com/dumbhippo/dm/fetch/BoundFetch.java
Log:
Fix computation of max for default-fetched feed properties

Modified: dumbhippo/trunk/server/src/com/dumbhippo/dm/fetch/BoundFetch.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/dm/fetch/BoundFetch.java	2007-12-21 19:18:21 UTC (rev 7115)
+++ dumbhippo/trunk/server/src/com/dumbhippo/dm/fetch/BoundFetch.java	2007-12-21 19:27:18 UTC (rev 7116)
@@ -129,6 +129,8 @@
 					oldMax = oldFetch.properties[oldIndex].getMax();
 					if (oldMax < property.getDefaultMaxFetch())
 						oldMax = property.getDefaultMaxFetch();
+				} else if (oldFetched) {
+					oldMax = property.getDefaultMaxFetch();
 				}
 							
 				int newMax = 0;
@@ -136,6 +138,8 @@
 					newMax = properties[newIndex].getMax();
 					if (newMax < property.getDefaultMaxFetch())
 						newMax = property.getDefaultMaxFetch();
+				} else if (newFetched) {
+					newMax = property.getDefaultMaxFetch();
 				}
 				
 				if (newMax > oldMax && (newChildren != null || oldChildren != null)) {
@@ -224,11 +228,13 @@
 				@SuppressWarnings("unchecked")
 				FeedPropertyHolder<K,T,?,?> property = (FeedPropertyHolder<K,T,?,?>)classProperties[classIndex];
 
-				int oldMax =0;
+				int oldMax = 0;
 				if (oldOrdering == classOrdering) {
 					oldMax = oldFetch.properties[oldIndex].getMax();
 					if (oldMax < property.getDefaultMaxFetch())
 						oldMax = property.getDefaultMaxFetch();
+				} else if (oldFetched) {
+					oldMax = property.getDefaultMaxFetch();
 				}
 							
 				int newMax = 0;
@@ -236,6 +242,8 @@
 					newMax = properties[newIndex].getMax();
 					if (newMax < property.getDefaultMaxFetch())
 						newMax = property.getDefaultMaxFetch();
+				} else if (newFetched) {
+					newMax = property.getDefaultMaxFetch();
 				}
 				
 				long minTimestamp;