Revision 45294 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/expressionevaluator/impl/function/dataaccess/ForeingValueFunction.java

View differences:

ForeingValueFunction.java
101 101 
        fieldName = fieldNames.get(i);
102 102 
        value = currentFeature.get(fieldName);
103 103 
        FeatureAttributeDescriptor attrdesc = currentFeature.getType().getAttributeDescriptor(fieldName);
104 
        ForeingKey foreingKey = attrdesc.getForeingKey();
105 
        // ContextForeingKey context = foreingKey.createContext();
106 
        currentFeature = foreingKey.getFeature(null, value);
107 
        // DisposeUtils.disposeQuietly(context);
108 
        if (currentFeature == null) {
109 
          return null;
104 
        if (attrdesc.isForeingKey()) {
105 
            ForeingKey foreingKey = attrdesc.getForeingKey();
106 
            // ContextForeingKey context = foreingKey.createContext();
107 
            currentFeature = foreingKey.getFeature(null, value);
108 
            // DisposeUtils.disposeQuietly(context);
109 
            if (currentFeature == null) {
110 
              return null;
111 
            }
110 112 
        }
111 113 
      }
112 114 
      fieldName = fieldNames.get(fieldNames.size() - 1);

Also available in: Unified diff