diff options
| author | Tom Schindl | 2012-02-24 00:10:58 +0000 |
|---|---|---|
| committer | Tom Schindl | 2012-02-24 00:10:58 +0000 |
| commit | 3e4bd5e76ebe16005a36d3110bfcd3f182214dd5 (patch) | |
| tree | 22be115bbd715b5ad58f61b113791777c6cdfd75 | |
| parent | a2afc05424a69508298c97051e71d385bfbb5b08 (diff) | |
| download | org.eclipse.e4.tools-3e4bd5e76ebe16005a36d3110bfcd3f182214dd5.tar.gz org.eclipse.e4.tools-3e4bd5e76ebe16005a36d3110bfcd3f182214dd5.tar.xz org.eclipse.e4.tools-3e4bd5e76ebe16005a36d3110bfcd3f182214dd5.zip | |
Bug 371989 - Fail to open e4 workbench Editor
| -rw-r--r-- | bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java index b4c9c83d..7606412e 100644 --- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java +++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java @@ -244,11 +244,11 @@ public class ResourceService implements IResourceService { protected void removePooledResource(PooledResource<?> resource) { if (resource.getResource() instanceof Image) { - displayPool.get(resource.display).getImagePool().remove(resource); + displayPool.get(resource.display).getImagePool().remove(resource.imageKey); } else if (resource.getResource() instanceof Color) { - displayPool.get(resource.display).getColorPool().remove(resource); + displayPool.get(resource.display).getColorPool().remove(resource.imageKey); } else if (resource.getResource() instanceof Font) { - displayPool.get(resource.display).getFontPool().remove(resource); + displayPool.get(resource.display).getFontPool().remove(resource.imageKey); } } @@ -268,7 +268,7 @@ public class ResourceService implements IResourceService { } } - if (resource != null) { + if (resource != null && resource.getResource() != null) { resource.count++; } else { resource = new PooledResource<R>(display, this, key, |