Revision 36207 branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/impl/featureset/DefaultFeatureSet.java

View differences:

DefaultFeatureSet.java
10 10
import org.gvsig.fmap.dal.exception.DataException;
11 11
import org.gvsig.fmap.dal.feature.EditableFeature;
12 12
import org.gvsig.fmap.dal.feature.Feature;
13
import org.gvsig.fmap.dal.feature.FeatureIndexes;
13 14
import org.gvsig.fmap.dal.feature.FeatureQuery;
14 15
import org.gvsig.fmap.dal.feature.FeatureQueryOrder.FeatureQueryOrderMember;
15 16
import org.gvsig.fmap.dal.feature.FeatureSet;
......
98 99
			this.defatulFeatureTypeForProvider = this.defatulFeatureType;
99 100
		}
100 101

  
101
		if (this.queryForProvider.hasFilter() && store.getIndexes() != null) {
102
			this.provider = (FeatureSetProvider) store.getIndexes()
102
        FeatureIndexes indexes = store.getIndexes();
103
        if (this.queryForProvider.hasFilter() && indexes != null
104
            && indexes.areValid()) {
105
            this.provider =
106
                (FeatureSetProvider) indexes
103 107
					.getFeatureSet(this.queryForProvider.getFilter());
104 108
		}
105 109
		if (this.provider == null) {

Also available in: Unified diff