Bad mocking of Monitors in test

neo4j · Aug 23, 2016 · 172fb75 · 172fb75
1 parent 0c4df5a
commit 172fb75
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/TxPollingClient.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/TxPollingClient.java
@@ -102,8 +102,9 @@ private synchronized void onTimeout()
         try
         {
             transactionServer = connectionStrategy.coreMember();
-            pullRequestMonitor.txPullRequest( applier.lastAppliedTxId() );
-            TxPullRequest txPullRequest = new TxPullRequest( applier.lastAppliedTxId(), localDatabase.get() );
+            long lastAppliedTxId = applier.lastAppliedTxId();
+            pullRequestMonitor.txPullRequest( lastAppliedTxId );
+            TxPullRequest txPullRequest = new TxPullRequest( lastAppliedTxId, localDatabase.get() );
             catchUpClient.makeBlockingRequest( transactionServer, txPullRequest, 30, TimeUnit.SECONDS,
                     new CatchUpResponseAdaptor<Long>() {
                         @Override

diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/tx/TxPollingClientTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/tx/TxPollingClientTest.java
@@ -63,7 +63,7 @@ public class TxPollingClientTest
 
     private final TxPollingClient txPuller = new TxPollingClient( NullLogProvider.getInstance(), () -> storeId,
             catchUpClient, serverSelection,
-            timeoutService, txPullTimeoutMillis, txApplier, mock(Monitors.class) );
+            timeoutService, txPullTimeoutMillis, txApplier, new Monitors() );
 
     @Before
     public void before() throws Throwable