Changeset 7306

Timestamp:

Mar 7, 2017, 8:16:52 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2059: Problems to abort plug-ins that use the snapshot manager to load annotations

Added ThreadSignalHandler.hasRecieved() method to make it possible to check if an ABORT signal has been received even if the threads interrupt flag has been reset by some other code.

File:

• branches/3.10-stable/src/core/net/sf/basedb/core/signal/ThreadSignalHandler.java (modified) (3 diffs)

branches/3.10-stable/src/core/net/sf/basedb/core/signal/ThreadSignalHandler.java

@@ -150 +150 @@
   
   /**
+    If TRUE, at least one ABORT signal has been recieved.
+    @since 3.10.1
+  */
+  private boolean hasAborted;
+  
+  /**
     Create a new thread signal handler. It will interrupt the
     current thread when it recieves the {@link Signal#ABORT} signal.
@@ -191 +197 @@
     if (Signal.ABORT.equals(signal))
     {
+      hasAborted = true;
       logger.debug("Sending signal " + signal + " to thread: " + workerThread);
       if (forceStop)
@@ -235 +242 @@
   }
   
-}
+  /**
+    Check if the given signal has been received by this signal handler.
+    @param signal The signal to check for
+    @return TRUE if the signal has been received, FALSE otherwise
+    @since 3.10.1
+  */
+  public boolean hasReceived(Signal signal)
+  {
+    return hasAborted && signal == Signal.ABORT;
+  }
+
+}