Don't renew timer when sync.makeDoneByTimeout is used

Author: zilm13

ethereumj-core/src/main/java/org/ethereum/sync/SyncManager.java

@@ -108,7 +108,7 @@ public void accept(BlockWrapper blockWrapper) {
     private long importStart;
     private EthereumListener.SyncState syncDoneType = EthereumListener.SyncState.COMPLETE;
     private ScheduledExecutorService logExecutor = Executors.newSingleThreadScheduledExecutor();
-    private LocalDateTime lastSyncAction;
+    private LocalDateTime initRegularTime;
 
     private AtomicInteger blocksInMem = new AtomicInteger(0);
 
@@ -171,15 +171,17 @@ void initRegularSync(EthereumListener.SyncState syncDoneType) {
 
         if (config.makeDoneByTimeout() >= 0) {
             logger.info("Custom long sync done timeout set to {} second(s)", config.makeDoneByTimeout());
-            this.lastSyncAction = LocalDateTime.now();
+            this.initRegularTime = LocalDateTime.now();
             ScheduledExecutorService shortSyncAwait = Executors.newSingleThreadScheduledExecutor();
             shortSyncAwait.scheduleAtFixedRate(() -> {
                 try {
-                    if (LocalDateTime.now().minusSeconds(config.makeDoneByTimeout()).isAfter(lastSyncAction) &&
+                    if (LocalDateTime.now().minusSeconds(config.makeDoneByTimeout()).isAfter(initRegularTime) &&
                             getLastKnownBlockNumber() == blockchain.getBestBlock().getNumber()) {
                         logger.info("Sync done triggered by timeout");
                         makeSyncDone();
                         shortSyncAwait.shutdown();
+                    } else if (syncDone) {
+                        shortSyncAwait.shutdown();
                     }
                 } catch (Exception e) {
                     logger.error("Unexpected", e);
@@ -296,9 +298,6 @@ private void produceQueue() {
                     if (wrapper.isNewBlock() && !syncDone) {
                         makeSyncDone();
                     }
-                    if (config.makeDoneByTimeout() >= 0 && !syncDone) {
-                        this.lastSyncAction = LocalDateTime.now();
-                    }
                 }
 
                 if (importResult == IMPORTED_NOT_BEST)

ethereumj-core/src/main/resources/ethereumj.conf

@@ -307,7 +307,7 @@ sync {
     exitOnBlockConflict = false
 
     # Make long sync done (switch to short sync) in XX seconds
-    # if there are no new blocks and all known blocks already downloaded.
+    # if all known blocks already downloaded.
     # Useful in private networks where auto-switch could fail.
     # Recommended value for private networks: 60 (seconds)
     makeDoneByTimeout = -1