Revision 6500
| org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.fmap.dal.raster/org.gvsig.fmap.dal.raster.impl/src/main/java/org/gvsig/fmap/dal/raster/impl/DefaultRasterStore.java | ||
|---|---|---|
| 74 | 74 |
import org.gvsig.raster.lib.buffer.api.BandInfo; |
| 75 | 75 |
import org.gvsig.timesupport.Interval; |
| 76 | 76 |
import org.gvsig.tools.ToolsLocator; |
| 77 |
import org.gvsig.tools.dispose.DisposeUtils; |
|
| 77 | 78 |
import org.gvsig.tools.dispose.impl.AbstractDisposable; |
| 78 | 79 |
import org.gvsig.tools.dynobject.DelegatedDynObject; |
| 79 | 80 |
import org.gvsig.tools.dynobject.DynClass; |
| ... | ... | |
| 576 | 577 |
|
| 577 | 578 |
@Override |
| 578 | 579 |
public Envelope getEnvelope() throws DataException {
|
| 579 |
return this.getRasterSet().getEnvelope(); |
|
| 580 |
RasterSet rasterSet = this.getRasterSet(); |
|
| 581 |
try {
|
|
| 582 |
return rasterSet.getEnvelope(); |
|
| 583 |
} finally {
|
|
| 584 |
if (rasterSet != null) {
|
|
| 585 |
DisposeUtils.dispose(rasterSet); |
|
| 586 |
rasterSet = null; |
|
| 587 |
} |
|
| 588 |
} |
|
| 580 | 589 |
} |
| 581 | 590 |
|
| 582 | 591 |
@Override |
| org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.fmap.dal.raster/org.gvsig.fmap.dal.raster.spi/src/main/java/org/gvsig/fmap/dal/raster/spi/AbstractRasterStoreProvider.java | ||
|---|---|---|
| 35 | 35 |
import org.gvsig.fmap.dal.resource.spi.ResourceProvider; |
| 36 | 36 |
import org.gvsig.fmap.dal.spi.DataStoreProviderServices; |
| 37 | 37 |
import org.gvsig.timesupport.Interval; |
| 38 |
import org.gvsig.tools.dispose.Disposable; |
|
| 39 |
import org.gvsig.tools.dispose.DisposeUtils; |
|
| 38 | 40 |
import org.gvsig.tools.dispose.impl.AbstractDisposable; |
| 39 | 41 |
import org.gvsig.tools.dynobject.DelegatedDynObject; |
| 40 | 42 |
import org.gvsig.tools.dynobject.DynClass; |
| ... | ... | |
| 211 | 213 |
} |
| 212 | 214 |
|
| 213 | 215 |
protected void doDispose() throws BaseException {
|
| 216 |
if (this.store != null && this.store instanceof Disposable){
|
|
| 217 |
DisposeUtils.dispose((Disposable) this.store); |
|
| 218 |
} |
|
| 219 |
this.store = null; |
|
| 214 | 220 |
this.metadata = null; |
| 215 |
this.store = null;
|
|
| 221 |
this.parameters = null;
|
|
| 216 | 222 |
} |
| 217 | 223 |
} |
| org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.fmap.mapcontext.raster/org.gvsig.fmap.mapcontext.raster.impl/src/main/java/org/gvsig/fmap/mapcontext/raster/impl/DefaultRasterLayer.java | ||
|---|---|---|
| 346 | 346 |
|
| 347 | 347 |
@Override |
| 348 | 348 |
protected void doDispose() throws BaseException {
|
| 349 |
ToolsLocator.getDisposableManager().release(this.store);
|
|
| 350 |
DisposeUtils.dispose(store);
|
|
| 349 |
DisposeUtils.dispose(this.store);
|
|
| 350 |
this.store = null;
|
|
| 351 | 351 |
this.legend = null; |
| 352 | 352 |
this.baseQuery = null; |
| 353 | 353 |
} |
Also available in: Unified diff