core-edge: revert some timeout service changes

neo4j · Jul 14, 2016 · ef9b7e7 · ef9b7e7
1 parent a172b30
commit ef9b7e7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/...prise/core-edge/src/main/java/org/neo4j/coreedge/raft/DelayedRenewableTimeoutService.java b/...prise/core-edge/src/main/java/org/neo4j/coreedge/raft/DelayedRenewableTimeoutService.java
@@ -37,7 +37,6 @@
 import org.neo4j.logging.LogProvider;
 
 import static java.lang.System.nanoTime;
-
 import static org.neo4j.kernel.impl.util.JobScheduler.SchedulingStrategy.POOLED;
 
 /**
@@ -149,7 +148,17 @@ public synchronized void run()
             }
         }
 
-        triggered.forEach( ScheduledRenewableTimeout::trigger );
+        for ( ScheduledRenewableTimeout timeout : triggered )
+        {
+            try
+            {
+                timeout.trigger();
+            }
+            catch ( Throwable e )
+            {
+                log.error( "Exception triggering timeout handler", e );
+            }
+        }
 
         synchronized ( timeouts )
         {

diff --git a/.../core-edge/src/main/java/org/neo4j/coreedge/raft/replication/shipping/RaftLogShipper.java b/.../core-edge/src/main/java/org/neo4j/coreedge/raft/replication/shipping/RaftLogShipper.java
@@ -280,22 +280,18 @@ private synchronized void onScheduledTimeoutExpiry()
         if ( timedOut() )
         {
             onTimeout();
-            return;
-        }
-
-        if ( timeoutAbsoluteMillis <= 0 )
-        {
-            return;
-        }
-
-        long timeLeft = timeoutAbsoluteMillis - clock.millis();
-        if ( timeLeft > 0 )
-        {
-            scheduleTimeout( timeLeft );
         }
-        else
+        else if ( timeoutAbsoluteMillis != 0 )
         {
-            onTimeout();
+            long timeLeft = timeoutAbsoluteMillis - clock.millis();
+            if ( timeLeft > 0 )
+            {
+                scheduleTimeout( timeLeft );
+            }
+            else
+            {
+                onTimeout();
+            }
         }
     }