summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-05 16:13:32 (EDT)
committerEike Stepper2007-07-05 16:13:32 (EDT)
commitff046333aeb36d4e18880c93d98d2e6f06d89e34 (patch)
tree0843bd1415b9210d230ff938f87f16ef0a092203
parent65f9da144285e7e22bec7c270e56620b03b91624 (diff)
downloadcdo-ff046333aeb36d4e18880c93d98d2e6f06d89e34.zip
cdo-ff046333aeb36d4e18880c93d98d2e6f06d89e34.tar.gz
cdo-ff046333aeb36d4e18880c93d98d2e6f06d89e34.tar.bz2
task 1: Develop 0.8.0
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java12
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 d2b442b..bf34c55 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);
}
}
}