Merge 3.3 into 3.4

neo4j · Sep 25, 2017 · b303bf8 · b303bf8
2 parents 3550399 + 92bcd9b
commit b303bf8
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/PropertyContainerLocker.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/PropertyContainerLocker.java
@@ -40,8 +40,10 @@ public Lock exclusiveLock( Supplier<Statement> stmtSupplier, PropertyContainer c
         {
             if ( container instanceof Node )
             {
-                statement.readOperations().acquireExclusive( ResourceTypes.NODE, ((Node) container).getId() );
-                return new CoreAPILock( stmtSupplier, ResourceTypes.NODE, ((Node) container).getId() )
+                long id = ((Node) container).getId();
+                ResourceTypes resourceType = ResourceTypes.NODE;
+                statement.readOperations().acquireExclusive( resourceType, id );
+                return new CoreAPILock( stmtSupplier, resourceType, id )
                 {
                     @Override
                     void release( Statement statement, ResourceType type, long resourceId )
@@ -52,8 +54,10 @@ void release( Statement statement, ResourceType type, long resourceId )
             }
             else if ( container instanceof Relationship )
             {
-                statement.readOperations().acquireExclusive( ResourceTypes.RELATIONSHIP, ((Relationship) container).getId() );
-                return new CoreAPILock( stmtSupplier, ResourceTypes.RELATIONSHIP, ((Relationship) container).getId() )
+                long id = ((Relationship) container).getId();
+                ResourceTypes resourceType = ResourceTypes.RELATIONSHIP;
+                statement.readOperations().acquireExclusive( resourceType, id );
+                return new CoreAPILock( stmtSupplier, resourceType, id )
                 {
                     @Override
                     void release( Statement statement, ResourceType type, long resourceId )
@@ -105,8 +109,10 @@ public Lock sharedLock( Supplier<Statement> stmtProvider, PropertyContainer cont
         {
             if ( container instanceof Node )
             {
-                statement.readOperations().acquireShared( ResourceTypes.NODE, ((Node) container).getId() );
-                return new CoreAPILock( stmtProvider, ResourceTypes.NODE, ((Node) container).getId() )
+                long id = ((Node) container).getId();
+                ResourceTypes resourceType = ResourceTypes.NODE;
+                statement.readOperations().acquireShared( resourceType, id );
+                return new CoreAPILock( stmtProvider, resourceType, id )
                 {
                     @Override
                     void release( Statement statement, ResourceType type, long resourceId )
@@ -117,8 +123,10 @@ void release( Statement statement, ResourceType type, long resourceId )
             }
             else if ( container instanceof Relationship )
             {
-                statement.readOperations().acquireShared( ResourceTypes.RELATIONSHIP, ((Relationship) container).getId() );
-                return new CoreAPILock( stmtProvider, ResourceTypes.RELATIONSHIP, ((Relationship) container).getId() )
+                long id = ((Relationship) container).getId();
+                ResourceTypes resourceType = ResourceTypes.RELATIONSHIP;
+                statement.readOperations().acquireShared( resourceType, id );
+                return new CoreAPILock( stmtProvider, resourceType, id )
                 {
                     @Override
                     void release( Statement statement, ResourceType type, long resourceId )