Merge branch 'dev-enhance-SolidLookAhead' into dev

iotaledger · Jun 4, 2017 · aedabb8 · aedabb8
2 parents 475347d + 0851d9c
commit aedabb8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/com/iota/iri/Milestone.java b/src/main/java/com/iota/iri/Milestone.java
@@ -168,6 +168,7 @@ private boolean validateMilestone(TransactionViewModel transactionViewModel, int
     void updateLatestSolidSubtangleMilestone() throws Exception {
         MilestoneViewModel milestoneViewModel;
         MilestoneViewModel latest = MilestoneViewModel.latest(tangle);
+        int lookAhead = 0;
         if (latest != null) {
             for (milestoneViewModel = MilestoneViewModel.findClosestNextMilestone(tangle, latestSolidSubtangleMilestoneIndex);
                  milestoneViewModel != null && milestoneViewModel.index() <= latest.index() && !shuttingDown;
@@ -178,7 +179,10 @@ void updateLatestSolidSubtangleMilestone() throws Exception {
                     latestSolidSubtangleMilestone = milestoneViewModel.getHash();
                     latestSolidSubtangleMilestoneIndex = milestoneViewModel.index();
                 } else {
-                    break;
+                    lookAhead++;
+                    if (lookAhead>=10) {
+                        break;
+                    }
                 }
             }
         }