diff options
| author | Eike Stepper | 2010-07-02 14:26:58 +0000 |
|---|---|---|
| committer | Eike Stepper | 2010-07-02 14:26:58 +0000 |
| commit | b9c486db82ec2aece763c2362f51981a58a831ea (patch) | |
| tree | 4880fb6ebbb1daf8870df509794515743eabea16 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal | |
| parent | 8d1e34b3540343643dc1506f6759d9d10200fe91 (diff) | |
| download | cdo-b9c486db82ec2aece763c2362f51981a58a831ea.tar.gz cdo-b9c486db82ec2aece763c2362f51981a58a831ea.tar.xz cdo-b9c486db82ec2aece763c2362f51981a58a831ea.zip | |
[317144] Notification Merge Problem
https://bugs.eclipse.org/bugs/show_bug.cgi?id=317144
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDODeltaNotificationImpl.java | 17 |
1 files changed, 10 insertions, 7 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 467e2189bd..4bfc46eb9d 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 @@ -246,12 +246,15 @@ public class CDODeltaNotificationImpl extends ENotificationImpl implements CDODe @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); + // Do not merge at all. See bug 317144. + return false; + + // if (eventType == REMOVE_MANY && newValue == null) + // { + // // Means that clear all was executed and no merging can appear + // return false; + // } + // + // return super.merge(notification); } } |