[Geotools-commits] svn - r36408 - branches/2.6.x/modules/unsupported/app-schema/app-schema/src/main/java/org/geotools/data/complex

[<svn...@os...>]

Author: ang05a
Date: 2010-12-19 23:05:53 -0800 (Sun, 19 Dec 2010)
New Revision: 36408

Modified:
   branches/2.6.x/modules/unsupported/app-schema/app-schema/src/main/java/org/geotools/data/complex/NestedAttributeMapping.java
Log:
Improvement for GEOT-3352: App-schema: filtering multi-valued nested attribute by feature chaining returns no results

Modified: branches/2.6.x/modules/unsupported/app-schema/app-schema/src/main/java/org/geotools/data/complex/NestedAttributeMapping.java
===================================================================
--- branches/2.6.x/modules/unsupported/app-schema/app-schema/src/main/java/org/geotools/data/complex/NestedAttributeMapping.java	2010-12-20 06:55:35 UTC (rev 36407)
+++ branches/2.6.x/modules/unsupported/app-schema/app-schema/src/main/java/org/geotools/data/complex/NestedAttributeMapping.java	2010-12-20 07:05:53 UTC (rev 36408)
@@ -242,12 +242,16 @@
 
 		if (matchingIdFilter != null) {
 			fCollection = source.getFeatures(matchingIdFilter);
-			it = fCollection.features();
 
-			while (it.hasNext()) {
-				matchingFeatures.add(it.next());
-			}
-			it.close();
+			if (fCollection.size() > matchingFeatures.size()) {
+				// there are rows of same id from denormalised view
+				it = fCollection.features();
+				matchingFeatures.clear();
+				while (it.hasNext()) {
+					matchingFeatures.add(it.next());
+				}
+				it.close();
+			}	
 		}
 
 		return matchingFeatures;