Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-06-12 07:16:53 +0000
committerEike Stepper2008-06-12 07:16:53 +0000
commit8d6f7dd62d5d5b70e71a35f33338160df86222ca (patch)
tree2c6b2974409a0085a4afbeaae8fb0ac507e41093 /plugins
parent8300e9ed36dfd2108681bc6b9ce8d07174568917 (diff)
downloadcdo-8d6f7dd62d5d5b70e71a35f33338160df86222ca.tar.gz
cdo-8d6f7dd62d5d5b70e71a35f33338160df86222ca.tar.xz
cdo-8d6f7dd62d5d5b70e71a35f33338160df86222ca.zip
[236784] Invalidate and cache problem
https://bugs.eclipse.org/bugs/show_bug.cgi?id=236784
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index 5060e0096a..1fee02b189 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -352,6 +352,12 @@ public class CDOViewImpl extends org.eclipse.net4j.util.event.Notifier implement
{
synchronized (objects)
{
+ if (id.equals(lastLookupID))
+ {
+ lastLookupID = null;
+ lastLookupObject = null;
+ }
+
return objects.remove(id);
}
}
@@ -543,12 +549,7 @@ public class CDOViewImpl extends org.eclipse.net4j.util.event.Notifier implement
TRACER.format("Deregistering {0}", object);
}
- InternalCDOObject old;
- synchronized (objects)
- {
- old = objects.remove(object.cdoID());
- }
-
+ InternalCDOObject old = removeObject(object.cdoID());
if (old == null)
{
throw new IllegalStateException("Unknown ID: " + object);

Back to the top