Revision 27672 branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/impl/DefaultFeatureSelection.java

View differences:

DefaultFeatureSelection.java
34 34

  
35 35
import org.gvsig.fmap.dal.DataStoreNotification;
36 36
import org.gvsig.fmap.dal.exception.DataException;
37
import org.gvsig.fmap.dal.feature.DisposableIterator;
37 38
import org.gvsig.fmap.dal.feature.EditableFeature;
38 39
import org.gvsig.fmap.dal.feature.Feature;
39 40
import org.gvsig.fmap.dal.feature.FeatureReference;
40 41
import org.gvsig.fmap.dal.feature.FeatureSelection;
41 42
import org.gvsig.fmap.dal.feature.FeatureSet;
42 43
import org.gvsig.fmap.dal.feature.FeatureType;
43
import org.gvsig.fmap.dal.feature.DisposableIterator;
44 44
import org.gvsig.fmap.dal.feature.exception.ReversedSelectionIteratorException;
45 45
import org.gvsig.tools.persistence.PersistenceException;
46 46
import org.gvsig.tools.persistence.PersistentState;
......
376 376
        }
377 377

  
378 378
		public void dispose() {
379
			if (refIterator instanceof DisposableIterator) {
380
				((DisposableIterator) refIterator).dispose();
381
			}
379 382
			refIterator = null;
380 383
			featureStore = null;
381 384
		}
......
399 402

  
400 403
        private Feature nextFeature = null;
401 404

  
405
		private FeatureSet featureSet;
406

  
402 407
        public ReversedFeatureIteratorFacade(SelectionData selectionData,
403 408
                DefaultFeatureStore featureStore, boolean fastIterator) {
404 409
            this.selectionData = selectionData;
405 410

  
406 411
            // Load a Set with all the store features
407 412
            try {
408
                FeatureSet featureSet = featureStore.getFeatureSet();
413
                featureSet = featureStore.getFeatureSet();
409 414
                if (fastIterator) {
410 415
                    iterator = featureSet.fastIterator();
411 416
                } else {
......
447 452
        }
448 453

  
449 454
		public void dispose() {
455
			this.featureSet.dispose();
450 456
			this.iterator.dispose();
451 457
			this.selectionData = null;
452 458
			this.nextFeature = null;

Also available in: Unified diff