minor change in stop criterion checker

hdbeukel · Jun 6, 2015 · 4e94463 · 4e94463
1 parent 99934bd
commit 4e94463
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/src/main/java/org/jamesframework/core/search/stopcriteria/StopCriterionChecker.java b/src/main/java/org/jamesframework/core/search/stopcriteria/StopCriterionChecker.java
@@ -200,25 +200,25 @@ public void run() {
             // actions should be taken anymore (stopping the search could be dangerous because a next
             // search run might have been initiated in the meantime)
 
-            if(stopCriterionSatisfied()){
-                // synchronize on running task updates to ensure that this task
-                // is not cancelled while executing the following code block
-                synchronized(runningTaskLock){
-                    if (runningTask == this) {
+            // synchronize on running task updates to ensure that this task
+            // is not cancelled while executing the following code block
+            synchronized(runningTaskLock){
+                if (runningTask == this) {
+                    if(stopCriterionSatisfied()){
                         // stop checking
                         stopChecking();
                         // log
                         logger.debug("Requesting search {} to stop", search);
                         // stop the search
                         search.stop();
-                    } else {
-                        if(logger.isDebugEnabled()){
-                            // log
-                            logger.debug("Aborting cancelled stop criterion check task @{} for search {} (currently scheduled task: @{})",
-                                                Integer.toHexString(this.hashCode()),
-                                                search,
-                                                Integer.toHexString(runningTask.hashCode()));
-                        }
+                    }
+                } else {
+                    if(logger.isDebugEnabled()){
+                        // log
+                        logger.debug("Aborting cancelled stop criterion check task @{} for search {} (currently scheduled task: @{})",
+                                            Integer.toHexString(this.hashCode()),
+                                            search,
+                                            Integer.toHexString(runningTask.hashCode()));
                     }
                 }
             }