INTEGRATION: CWS sb23 (1.16.8); FILE MERGED

2006/08/18 16:21:28 sb 1.16.8.3: RESYNC: (1.16-1.17); FILE MERGED
2005/03/14 10:55:36 sb 1.16.8.2: #i35277# Further cleanup.
2005/02/18 09:21:48 sb 1.16.8.1: #i35277# More cleanup; functionality moved from java_remote_bridge to urp, so that urp can autonomously handle protocol property requests.

1 files changed, 8 insertions, 36 deletions

diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
index ca9e49f9bc41..9fbbe347a84b 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: JobQueue.java,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 19:01:12 $
+ *  last change: $Author: rt $ $Date: 2006-12-01 14:51:26 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,12 +38,6 @@ package com.sun.star.lib.uno.environments.remote;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
-
-
-import com.sun.star.lib.util.IInvokeHook;
-import com.sun.star.lib.util.IInvokable;
-
-
 import com.sun.star.uno.UnoRuntime;
 
 
@@ -57,7 +51,7 @@ import com.sun.star.uno.UnoRuntime;
  * (put by <code>putjob</code>) into the async queue, which is only
  * known by the sync queue.
  * <p>
- * @version     $Revision: 1.17 $ $ $Date: 2005-09-07 19:01:12 $
+ * @version     $Revision: 1.18 $ $ $Date: 2006-12-01 14:51:26 $
  * @author      Kay Ramme
  * @see         com.sun.star.lib.uno.environments.remote.ThreadPool
  * @see         com.sun.star.lib.uno.environments.remote.Job
@@ -70,12 +64,6 @@ public class JobQueue {
      */
     private static final boolean DEBUG = false;
 
-    /**
-     * E.g. to get privleges for security managers, it is
-     * possible to set a hook for the <code>JobDispatcher</code> thread.
-     */
-    static public IInvokeHook __JobDispatcher_run_hook;
-
     protected Job _head;                 // the head of the job list
     protected Job _tail;                 // the tail of the job list
 
@@ -99,7 +87,7 @@ public class JobQueue {
     /**
      * A thread for dispatching jobs
      */
-    class JobDispatcher extends Thread implements IInvokable {
+    class JobDispatcher extends Thread {
         Object _disposeId;
 
         JobDispatcher(Object disposeId) {
@@ -112,7 +100,9 @@ public class JobQueue {
             return _threadId;
         }
 
-        public Object invoke(Object params[]) {
+        public void run() {
+            if(DEBUG) System.err.println("ThreadPool$JobDispatcher.run: " + Thread.currentThread());
+
             try {
                   enter(2000, _disposeId);
             }
@@ -126,24 +116,6 @@ public class JobQueue {
                 release();
             }
 
-            return null;
-        }
-
-        public void run() {
-            if(DEBUG) System.err.println("ThreadPool$JobDispatcher.run: " + Thread.currentThread());
-
-            if(__JobDispatcher_run_hook != null) {
-                try {
-                    __JobDispatcher_run_hook.invoke(this, null);
-
-                }
-                catch(Exception exception) { // should not fly
-                    System.err.println(getClass().getName() + " - unexpected: method >doWork< threw an exception - " + exception);
-                }
-            }
-            else
-                invoke(null);
-
             if(DEBUG) System.err.println("##### " + getClass().getName() + ".run - exit:" + _threadId);
 
 //              try {
@@ -380,7 +352,7 @@ public class JobQueue {
                         _active = false;
                     }
 
-                    if(job.isFinal()) {
+                    if (!job.isRequest()) {
                         job.dispose();
 
                         quit = true;