From e18f573bfd5305135c70b5425fb2df09606df60f Mon Sep 17 00:00:00 2001
From: Tglman <tglman@tglman.com>
Date: Thu, 7 May 2015 13:11:07 +0100
Subject: [PATCH] improved fix on check deleted record, issue #4045

---
 .../blueprints/impls/orient/OrientElement.java        | 11 +++++++++--
 1 file changed, 9 insertions(+), 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
index a73b7acc7a2..d41c89f091b 100644
--- 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;
   }