Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index e997f8ed64..f8d18c7e8b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -2087,13 +2087,10 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
// The super implementation will return null for a transient (unattached) object;
// but in a tx, an transient object may previously have been attached. So we consult
// the cleanRevisions if that's the case.
- if (getDetachedObjects().containsValue(object))
+ CDORevisionKey revKey = cleanRevisions.get(object);
+ if (revKey != null && getDetachedObjects().containsValue(object))
{
- CDORevisionKey revKey = cleanRevisions.get(object);
- if (revKey != null)
- {
- id = revKey.getID();
- }
+ id = revKey.getID();
}
return id;

Back to the top