Issue #7772 was fixed.

orientechnologies · Oct 24, 2017 · 38df3e9 · 38df3e9
1 parent 83a2b9b
commit 38df3e9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/...hdb/src/main/java/com/orientechnologies/orient/graph/sql/functions/OSQLFunctionLabel.java b/...hdb/src/main/java/com/orientechnologies/orient/graph/sql/functions/OSQLFunctionLabel.java
@@ -71,8 +71,8 @@ private Object getLabel(final OrientBaseGraph graph, final OIdentifiable iCurren
     final ODocument rec = iCurrentRecord.getRecord();
 
     OClass klass = ODocumentInternal.getImmutableSchemaClass(rec);
-    if (klass == null && ODatabaseRecordThreadLocal.INSTANCE.getIfDefined() != null) {
-      ODatabaseRecordThreadLocal.INSTANCE.getIfDefined().getMetadata().reload();
+    if (klass == null && ODatabaseRecordThreadLocal.instance().getIfDefined() != null) {
+      ODatabaseRecordThreadLocal.instance().getIfDefined().getMetadata().reload();
       klass = rec.getSchemaClass();
     }
     if (klass.isVertexType()) {

diff --git a/graphdb/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientVertex.java b/graphdb/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientVertex.java
@@ -290,8 +290,8 @@ protected static OrientEdge getEdge(final OrientBaseGraph graph, final ODocument
       return null;
 
     OClass klass = ODocumentInternal.getImmutableSchemaClass(fieldRecord);
-    if (klass == null && ODatabaseRecordThreadLocal.INSTANCE.getIfDefined() != null) {
-      ODatabaseRecordThreadLocal.INSTANCE.getIfDefined().getMetadata().reload();
+    if (klass == null && ODatabaseRecordThreadLocal.instance().getIfDefined() != null) {
+      ODatabaseRecordThreadLocal.instance().getIfDefined().getMetadata().reload();
       klass = fieldRecord.getSchemaClass();
     }
 
@@ -1165,8 +1165,8 @@ private void addSingleVertex(final ODocument doc, final OMultiCollectionIterator
 
     final ODocument fieldRecord = ((OIdentifiable) fieldValue).getRecord();
     OClass klass = ODocumentInternal.getImmutableSchemaClass(fieldRecord);
-    if (klass == null && ODatabaseRecordThreadLocal.INSTANCE.getIfDefined() != null) {
-      ODatabaseRecordThreadLocal.INSTANCE.getIfDefined().getMetadata().reload();
+    if (klass == null && ODatabaseRecordThreadLocal.instance().getIfDefined() != null) {
+      ODatabaseRecordThreadLocal.instance().getIfDefined().getMetadata().reload();
       klass = fieldRecord.getSchemaClass();
     }
     if (klass.isVertexType()) {

diff --git a/graphdb/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientVertexIterator.java b/graphdb/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientVertexIterator.java
@@ -69,8 +69,8 @@ public Vertex createGraphElement(final Object iObject) {
     final OClass klass;
     if (ODocumentInternal.getImmutableSchemaClass(value) != null) {
       klass = ODocumentInternal.getImmutableSchemaClass(value);
-    } else if (ODatabaseRecordThreadLocal.INSTANCE.getIfDefined() != null) {
-      ODatabaseRecordThreadLocal.INSTANCE.getIfDefined().getMetadata().reload();
+    } else if (ODatabaseRecordThreadLocal.instance().getIfDefined() != null) {
+      ODatabaseRecordThreadLocal.instance().getIfDefined().getMetadata().reload();
       klass = value.getSchemaClass();
     } else {
       throw new IllegalStateException("Invalid content found between connections: " + value);
@@ -150,8 +150,8 @@ private boolean isVertex(final OIdentifiable iObject) {
 
     final OIdentifiable v;
     OClass klass = ODocumentInternal.getImmutableSchemaClass(value);
-    if (klass == null && ODatabaseRecordThreadLocal.INSTANCE.getIfDefined() != null) {
-      ODatabaseRecordThreadLocal.INSTANCE.getIfDefined().getMetadata().reload();
+    if (klass == null && ODatabaseRecordThreadLocal.instance().getIfDefined() != null) {
+      ODatabaseRecordThreadLocal.instance().getIfDefined().getMetadata().reload();
       klass = value.getSchemaClass();
     }
     if (klass.isVertexType()) {