1 files changed, 14 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index b13f8927d1..1696fbcfc7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -119,7 +119,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
     this.id = id;
   }
 
-  public void cdoInternalSetState(CDOState state)
+  public CDOState cdoInternalSetState(CDOState state)
   {
     if (this.state != state)
     {
@@ -128,7 +128,19 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
         TRACER.format("Setting state {0} for {1}", state, this);
       }
 
-      this.state = state;
+      try
+      {
+        return this.state;
+      }
+      finally
+      {
+        this.state = state;
+      }
+    }
+    else
+    {
+      // TODO Detect duplicate cdoInternalSetState() calls
+      return null;
     }
   }