Post merge checkstyle and 3.2 adaptations

neo4j · Aug 13, 2017 · f58668e · f58668e
1 parent 31c7877
commit f58668e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java
@@ -257,7 +257,7 @@ public class GraphDatabaseSettings implements LoadableConfig
 
     @Description("Configures the time interval between transaction monitor checks. Determines how often " +
             "monitor thread will check transaction for timeout.")
-    public static final Setting<Long> transaction_monitor_check_interval = setting( "dbms.transaction.monitor.check.interval", DURATION, "5s" );
+    public static final Setting<Duration> transaction_monitor_check_interval = setting( "dbms.transaction.monitor.check.interval", DURATION, "5s" );
 
     @Description( "The maximum amount of time to wait for running transactions to complete before allowing "
                   + "initiated database shutdown to continue" )

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java
@@ -755,7 +755,7 @@ private void buildTransactionMonitor( KernelTransactions kernelTransactions, Clo
                 new KernelTransactionTimeoutMonitor( kernelTransactions, clock, logService );
         KernelTransactionMonitorScheduler transactionMonitorScheduler =
                 new KernelTransactionMonitorScheduler( kernelTransactionTimeoutMonitor, scheduler,
-                        config.get( GraphDatabaseSettings.transaction_monitor_check_interval ) );
+                        config.get( GraphDatabaseSettings.transaction_monitor_check_interval ).toMillis() );
         life.add( transactionMonitorScheduler );
     }
 

diff --git a/...ity/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTimeoutMonitorIT.java b/...ity/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTimeoutMonitorIT.java
@@ -82,7 +82,8 @@ public void terminateExpiredTransaction() throws Exception
 
     private Runnable startAnotherTransaction()
     {
-        return () -> {
+        return () ->
+        {
             try ( InternalTransaction transaction = database
                     .beginTransaction( KernelTransaction.Type.implicit, SecurityContext.AUTH_DISABLED, 1,
                             TimeUnit.SECONDS ) )