summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-25 01:08:22 (EDT)
committerEike Stepper2007-07-25 01:08:22 (EDT)
commitda069c264ff4585c449466f36e1b49fd48d142b9 (patch)
tree3cb017221a027c8b28b1a3e80c4f243863f97626
parentc48a338c648a1aa04ed9eafe5df5f9f75d591dd7 (diff)
downloadcdo-da069c264ff4585c449466f36e1b49fd48d142b9.zip
cdo-da069c264ff4585c449466f36e1b49fd48d142b9.tar.gz
cdo-da069c264ff4585c449466f36e1b49fd48d142b9.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java6
-rw-r--r--plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF1
3 files changed, 2 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java
index 831020b..2ae1095 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java
@@ -131,12 +131,10 @@ public class CDOAdapterImpl extends AdapterImpl implements InternalCDOObject
case Notification.SET:
case Notification.UNSET:
InternalEObject notifier = (InternalEObject)msg.getNotifier();
- if (notifier != getTarget() || notifier.eIsProxy())
+ if (notifier == getTarget() && !notifier.eIsProxy())
{
- return;
+ CDOStateMachine.INSTANCE.write(this);
}
-
- CDOStateMachine.INSTANCE.write(this);
}
}
diff --git a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
index bb259fe..2a5be85 100644
--- a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
@@ -10,6 +10,5 @@ Require-Bundle: org.eclipse.core.runtime;resolution:=optional,
org.eclipse.net4j;visibility:=reexport
Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
Export-Package: org.eclipse.net4j.internal.tcp;version="0.8.0",
- org.eclipse.net4j.internal.tcp.bundle;version="0.8.0";x-friends:="org.eclipse.emf.cdo.tests.tdd",
org.eclipse.net4j.tcp;version="0.8.0"
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
index ae3a184..9ae8ac1 100644
--- a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Import-Package: org.eclipse.core.runtime;resolution:=optional,
org.osgi.service.log;version="1.3.0";resolution:=optional,
org.osgi.util.tracker;version="1.3.0";resolution:=optional
Export-Package: org.eclipse.net4j.internal.util;version="0.8.0",
- org.eclipse.net4j.internal.util.bundle,
org.eclipse.net4j.internal.util.collection;version="0.8.0",
org.eclipse.net4j.internal.util.concurrent;version="0.8.0",
org.eclipse.net4j.internal.util.container;version="0.8.0",