Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-04-20 08:10:18 +0000
committerEike Stepper2010-04-20 08:10:18 +0000
commite5aa70f14ef5dd4f14711ead0f27c70decb6b249 (patch)
tree4a16294c156e449408963719c2b31ccd7a5dec40 /plugins
parent3d0d093f84454fea8fa3a691521130277e1db47f (diff)
downloadcdo-e5aa70f14ef5dd4f14711ead0f27c70decb6b249.tar.gz
cdo-e5aa70f14ef5dd4f14711ead0f27c70decb6b249.tar.xz
cdo-e5aa70f14ef5dd4f14711ead0f27c70decb6b249.zip
[309768] NPE on converting CDO deltas to notifications
https://bugs.eclipse.org/bugs/show_bug.cgi?id=309768
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDODeltaNotificationImpl.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDODeltaNotificationImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDODeltaNotificationImpl.java
index 515226900b..4d0d64d85d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDODeltaNotificationImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDODeltaNotificationImpl.java
@@ -230,4 +230,16 @@ public class CDODeltaNotificationImpl extends ENotificationImpl implements CDODe
{
this.revisionDelta = revisionDelta;
}
+
+ @Override
+ public boolean merge(Notification notification)
+ {
+ if (eventType == REMOVE_MANY && newValue == null)
+ {
+ // Means that clear all was executed and no merging can appear
+ return false;
+ }
+
+ return super.merge(notification);
+ }
}

Back to the top