Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McDuff2008-11-07 15:22:46 -0500
committerSimon McDuff2008-11-07 15:22:46 -0500
commit95ccb2c352692d7917fdf9003cd3d15dd938694c (patch)
tree6d0daaa726a9a0f2e03afe38649652e47d4efd53
parent882921b0c4ce5f6d0eceb08464a46b6142c9bdf0 (diff)
downloadcdo-95ccb2c352692d7917fdf9003cd3d15dd938694c.tar.gz
cdo-95ccb2c352692d7917fdf9003cd3d15dd938694c.tar.xz
cdo-95ccb2c352692d7917fdf9003cd3d15dd938694c.zip
[251764] Differentiate an invalidate/detach_remote notification is currently not possible
https://bugs.eclipse.org/bugs/show_bug.cgi?id=251764
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java34
1 files changed, 17 insertions, 17 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 d8797a457c..aaf101509d 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
@@ -1065,32 +1065,32 @@ public class CDOViewImpl extends org.eclipse.net4j.util.event.Notifier implement
detachedObjects.add(cdoObject);
}
}
+ }
+ finally
+ {
+ lock.unlock();
+ }
- if (invalidationNotificationEnabled)
+ if (invalidationNotificationEnabled)
+ {
+ for (InternalCDOObject dirtyObject : dirtyObjects)
{
- for (InternalCDOObject dirtyObject : dirtyObjects)
+ if (dirtyObject.eNotificationRequired())
{
- if (dirtyObject.eNotificationRequired())
- {
- CDOInvalidationNotificationImpl notification = new CDOInvalidationNotificationImpl(dirtyObject);
- dirtyObject.eNotify(notification);
- }
+ CDOInvalidationNotificationImpl notification = new CDOInvalidationNotificationImpl(dirtyObject);
+ dirtyObject.eNotify(notification);
}
+ }
- for (InternalCDOObject detachedObject : detachedObjects)
+ for (InternalCDOObject detachedObject : detachedObjects)
+ {
+ if (detachedObject.eNotificationRequired())
{
- if (detachedObject.eNotificationRequired())
- {
- CDOInvalidationNotificationImpl notification = new CDOInvalidationNotificationImpl(detachedObject);
- detachedObject.eNotify(notification);
- }
+ CDOInvalidationNotificationImpl notification = new CDOInvalidationNotificationImpl(detachedObject);
+ detachedObject.eNotify(notification);
}
}
}
- finally
- {
- lock.unlock();
- }
fireInvalidationEvent(timeStamp, Collections.unmodifiableSet(dirtyObjects), Collections
.unmodifiableSet(detachedObjects));

Back to the top