diff options
author | Eike Stepper | 2007-07-05 20:13:32 +0000 |
---|---|---|
committer | Eike Stepper | 2007-07-05 20:13:32 +0000 |
commit | ff046333aeb36d4e18880c93d98d2e6f06d89e34 (patch) | |
tree | 0843bd1415b9210d230ff938f87f16ef0a092203 | |
parent | 65f9da144285e7e22bec7c270e56620b03b91624 (diff) | |
download | cdo-ff046333aeb36d4e18880c93d98d2e6f06d89e34.tar.gz cdo-ff046333aeb36d4e18880c93d98d2e6f06d89e34.tar.xz cdo-ff046333aeb36d4e18880c93d98d2e6f06d89e34.zip |
task 1: Develop 0.8.0
-rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java index d2b442b12d..bf34c55280 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java @@ -437,16 +437,16 @@ public final class CDOStore implements EStore { CDOObjectImpl container = cdoObject; CDOObjectImpl contained = (CDOObjectImpl)value; - CDOViewImpl containerAdapter = cdoObject.cdoView(); - CDOViewImpl containedAdapter = contained.cdoView(); - if (containedAdapter != containerAdapter) + CDOViewImpl containerView = container.cdoView(); + CDOViewImpl containedView = contained.cdoView(); + if (containedView != containerView) { - if (containedAdapter != null) + if (containedView != null) { - CDOStateMachine.INSTANCE.detach(contained, contained.cdoResource(), containedAdapter); + CDOStateMachine.INSTANCE.detach(contained, contained.cdoResource(), containedView); } - CDOStateMachine.INSTANCE.attach(contained, container.cdoResource(), containerAdapter); + CDOStateMachine.INSTANCE.attach(contained, container.cdoResource(), containerView); } } } |