improved fix on check deleted record, issue #4045

orientechnologies · May 7, 2015 · e18f573 · e18f573
1 parent 005a92d
commit e18f573
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/graphdb/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientElement.java b/graphdb/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientElement.java
@@ -116,9 +116,16 @@ protected boolean checkDeletedInTx() {
     OrientBaseGraph curGraph = getGraph();
     if (curGraph == null)
       return false;
-    final ORecordOperation oper = curGraph.getRawGraph().getTransaction().getRecordEntry(getIdentity());
+
+    ORID id;
+    if (getRecord() != null)
+      id = getRecord().getIdentity();
+    else
+      return false;
+
+    final ORecordOperation oper = curGraph.getRawGraph().getTransaction().getRecordEntry(id);
     if (oper == null)
-      return getIdentity().isTemporary();
+      return id.isTemporary();
     else
       return oper.type == ORecordOperation.DELETED;
   }