Revision 46171 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/searchpanel/SearchConditionFieldController.java

View differences:

SearchConditionFieldController.java
417 417 
        for (int i = 0; i < model.getSize(); i++) {
418 418 
            Field field = model.getElementAt(i);
419 419 
            FeatureAttributeDescriptor attrdescN = field.getDescriptor();
420 
            if (isTheSameStore(theStore, attrdescN.getStore())
420 
            if (theStore!=null && attrdescN.getStore()!=null && isTheSameStore(theStore, attrdescN.getStore())
421 421 
                    && StringUtils.equalsIgnoreCase(attrdesc.getName(), attrdescN.getName())) {
422 422 
                this.setAttribute(i);
423 423 
                return;

Also available in: Unified diff