Changeset 4265

Timestamp:

May 5, 2008, 9:37:08 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1001: Plug-ins that use the 'execute immediately' option can't be aborted

Location:

trunk

Files:

• src/core/net/sf/basedb/core/InternalJobQueue.java (modified) (3 diffs)
• www/common/plugin/index.jsp (modified) (3 diffs)

trunk/src/core/net/sf/basedb/core/InternalJobQueue.java

@@ -26 +26 @@
 
 import net.sf.basedb.core.plugin.Response;
+import net.sf.basedb.core.signal.LocalSignalReceiver;
 import net.sf.basedb.core.signal.SignalReceiver;
 import net.sf.basedb.core.data.JobData;
@@ -156 +157 @@
   @base.modified $Date$
 */
-final class InternalJobQueue
+public final class InternalJobQueue
   extends TimerTask
 {
@@ -214 +215 @@
   private static SignalReceiver signalReceiver;
 
+  /**
+    Get the signal receiver used by the internal job queue. If the 
+    internal job queue is disabled a {@link LocalSignalReceiver}
+    is created on the first call to this method.
+    @return A signal receiver object
+    @since 2.7
+  */
+  public synchronized static SignalReceiver getSignalReceiver()
+  {
+    if (signalReceiver == null)
+    {
+      signalReceiver = new LocalSignalReceiver();
+      signalReceiver.init("localhost:0");
+    }
+    return signalReceiver;
+  }
+  
   /**
     Create the job queue. The one and only instance is created

trunk/www/common/plugin/index.jsp

@@ -1 @@
-<%@page import="net.sf.basedb.core.Experiment"%>
 <%-- $Id$
   ------------------------------------------------------------------
@@ -53 +52 @@
   import="net.sf.basedb.core.Job"
   import="net.sf.basedb.core.Type"
+  import="net.sf.basedb.core.Experiment"
+  import="net.sf.basedb.core.InternalJobQueue"
   import="net.sf.basedb.core.BaseException"
   import="net.sf.basedb.core.PermissionDeniedException"
@@ -534 +535 @@
     {
       PluginExecutionRequest executionRequest = pluginResponse.getExecutionRequest(null);
+      executionRequest.registerSignalReceiver(InternalJobQueue.getSignalReceiver());
       Thread t = new Thread(executionRequest);
       t.setPriority(Thread.currentThread().getPriority() - 1);