Skip to content

GitLab

Commit c7e21270 authored by Daniel Le Berre's avatar Daniel Le Berre
Browse files
Options

synchronizing both access to the timer object. Thanks Romain.

parent b430d191
Pipeline #2949 passed with stages
      in 40 minutes and 43 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 7 additions and 3 deletions
      org.sat4j.core/src/main/java/org/sat4j/minisat/core/Solver.java
      View file @ c7e21270
      ...@@ -1830,9 +1830,13 @@ public class Solver<D extends DataStructureFactory> ...@@ -1830,9 +1830,13 @@ public class Solver<D extends DataStructureFactory>
      cancelUntil(0); cancelUntil(0);
      cancelLearntLiterals(learnedLiteralsLimit); cancelLearntLiterals(learnedLiteralsLimit);
      if (!global && this.timeBasedTimeout && this.timer != null) { if (!global && this.timeBasedTimeout) {
      this.timer.cancel(); synchronized (this) {
      this.timer = null; if (this.timer != null) {
      this.timer.cancel();
      this.timer = null;
      }
      }
      } }
      this.slistener.end(status); this.slistener.end(status);
      if (!this.undertimeout) { if (!this.undertimeout) {
      ......
      Markdown is supported
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment