[Geotools-commits] svn - r38826 - trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter

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

Author: victortey
Date: 2012-06-21 21:06:50 -0700 (Thu, 21 Jun 2012)
New Revision: 38826

Modified:
   trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter/XPath.java
Log:
GEOT-3454: Geoserver app-schema: types that only have client properties attributes are always skipped : fixed online test build failure

Modified: trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter/XPath.java
===================================================================
--- trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter/XPath.java	2012-06-22 01:16:09 UTC (rev 38825)
+++ trunk/modules/extension/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter/XPath.java	2012-06-22 04:06:50 UTC (rev 38826)
@@ -833,17 +833,12 @@
             if (isLastStep) {
                 // reached the leaf
                 if (currStepDescriptor == null) {
-                    throw new IllegalArgumentException(currStep + " is not a valid location path for type "
-                            + _parentType.getName());
+                    throw new IllegalArgumentException(currStep
+                            + " is not a valid location path for type " + _parentType.getName());
                 }
-                if (value == null && !currStepDescriptor.isNillable() && sourceExpression != null
-                        && !sourceExpression.equals(Expression.NIL)) {
-                    if (currStepDescriptor.getMinOccurs() == 0) {
-                        return null;
-                    }
-                }
-                return setLeafAttribute(currStepDescriptor, currStep, id, value,
-                        parent, targetNodeType, isXlinkRef);
+
+                return setLeafAttribute(currStepDescriptor, currStep, id, value, parent,
+                        targetNodeType, isXlinkRef);
             } else {
                 // parent = appendComplexProperty(parent, currStep,
                 // currStepDescriptor);