Master conversations use locks delegate

neo4j · Jul 21, 2016 · 2703374 · 2703374
1 parent ee246ef
commit 2703374
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java b/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
@@ -600,8 +600,8 @@ private void commit() throws TransactionFailureException
                     }
                 }
 
-                context.init( locks.delegate() );
                 locks.prepare();
+                context.init( locks.delegate() );
                 prepareRecordChangesFromTransactionState();
             }
 

diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultConversationSPI.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultConversationSPI.java
@@ -29,8 +29,8 @@
  */
 public class DefaultConversationSPI implements ConversationSPI
 {
-    private Locks locks;
-    private JobScheduler jobScheduler;
+    private final Locks locks;
+    private final JobScheduler jobScheduler;
 
     public DefaultConversationSPI( Locks locks, JobScheduler jobScheduler )
     {
@@ -41,13 +41,12 @@ public DefaultConversationSPI( Locks locks, JobScheduler jobScheduler )
     @Override
     public Locks.Client acquireClient()
     {
-        return locks.newClient();
+        return locks.newClient().delegate();
     }
 
     @Override
     public JobScheduler.JobHandle scheduleRecurringJob( JobScheduler.Group group, long interval, Runnable job )
     {
         return jobScheduler.scheduleRecurring( group, job, interval, TimeUnit.MILLISECONDS);
     }
-
 }