fixes_restore_feature_from_reference_with_null_value_in_pk.patch

Jose Manuel Vivó Arnal, 11/18/2013 03:46 PM

     				.getDefaultFeatureType());
+    	}
     	/**
     	 * Return "is null" expression for current provider<br/>
     	 */
     	protected String getIsNullExpression() {
     	    return "is null";
+    	}
     	@Override
     	protected FeatureProvider internalGetFeatureProviderByReference(
     			FeatureReferenceProviderServices reference,
-...
     		List<Object> values = new ArrayList<Object>();
     		int i;
     		for (i = 0; i < pk.length - 1; i++) {
     			values.add(
     					helper.dalValueToJDBC(pk[i],
     					reference.getKeyValue(pk[i].getName())));
     			filter.append(helper.getSqlFieldName(pk[i]));
     			filter.append(" = ? AND ");
     		Object value;
     		for (i = 0; i < pk.length; i++) {
     		    value = reference.getKeyValue(pk[i].getName());
     		    filter.append(helper.getSqlFieldName(pk[i]));
     		    if (value == null) {
     		        filter.append(" ");
     		        filter.append(getIsNullExpression());
     		        filter.append("");
     		    } else {
     			values.add(helper.dalValueToJDBC(pk[i], value));
     			filter.append(" = ? ");
+    		    }
     		    if (i < pk.length -1) {
     		        filter.append(" AND ");
+    		    }
+    		}
     		values.add(helper.dalValueToJDBC(pk[i],
     				reference.getKeyValue(pk[i].getName())));
     		filter.append(helper.getSqlFieldName(pk[i]));
     		filter.append(" = ? ");
     		String sql = compoundSelect(featureType, filter.toString(), null, 1, 0);
-...
     							toAdd = false;
     							break;
+    						}
     						if (toAdd) {
     							sql.append(", ");
     							sql.append(helper.getSqlFieldName(pkFields[i]));
+    						}
+    					}
     					if (toAdd) {
     					    sql.append(", ");
     					    sql.append(helper.getSqlFieldName(pkFields[i]));
+    					}
+    				}
     				sql.append(' ');