Revision 19606 trunk/libraries/libDataSourceBaseDrivers/src/org/gvsig/data/datastores/vectorial/driver/dbf/DBFFeatureCollection.java

View differences:

DBFFeatureCollection.java
49 49
	public int size() {
50 50
		if (this.size < 0){
51 51
			if (filter==null){
52
				this.size = driverFeatureCount+featureManager.getNum();
52
				this.size = driverFeatureCount;
53
				if (featureManager!=null){
54
					this.size += featureManager.getNum();
55
				}
53 56
			} else {
54 57
				Iterator iterator= this.iterator();
55 58
				this.size=0;
......
176 179
				if (position<driverFeatureCount){
177 180
					IFeatureID featureID = this.createCurrectDriverFeatureID(position);
178 181
					feature=featureID.getFeature(featureType);
179
				}else if ((position-driverFeatureCount)<featureManager.getNum()){
182
				}else if (featureManager!=null && (position-driverFeatureCount)<featureManager.getNum()){
180 183
					int pos=(int)(position-driverFeatureCount);
181 184
					feature=featureManager.getFeature(pos);
182 185
				}else{
......
186 189

  
187 190
				position++;
188 191

  
189
				if(featureManager.isDeleted(feature))
192
				if(featureManager!=null && featureManager.isDeleted(feature))
190 193
					continue;
191 194

  
192 195
				if (filter == null) {

Also available in: Unified diff