From 08f91621064af191219e4c5bab14c8e0a8062855 Mon Sep 17 00:00:00 2001 From: Victor Roldan Betancort Date: Thu, 15 Dec 2011 17:51:14 +0000 Subject: Bug 366803 - Improve performance of CDOTransactionImpl.getID(InternalCDOObject, boolean) --- .../eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java | 9 +++------ 1 file 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; -- cgit v1.2.3