[jboss-cvs] JBoss Messaging SVN: r7896 - in branches/Branch_1_4/src/main/org/jboss: jms/client/state and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: gaohoward
Date: 2009-11-08 23:09:58 -0500 (Sun, 08 Nov 2009)
New Revision: 7896

Modified:
   branches/Branch_1_4/src/main/org/jboss/jms/client/container/ConsumerAspect.java
   branches/Branch_1_4/src/main/org/jboss/jms/client/state/ConnectionState.java
   branches/Branch_1_4/src/main/org/jboss/jms/client/state/SessionState.java
   branches/Branch_1_4/src/main/org/jboss/messaging/util/CompatibleExecutor.java
   branches/Branch_1_4/src/main/org/jboss/messaging/util/OrderedExecutorFactory.java
Log:
JBMESSAGING-1756


Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/container/ConsumerAspect.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/container/ConsumerAspect.java	2009-11-06 03:20:28 UTC (rev 7895)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/container/ConsumerAspect.java	2009-11-09 04:09:58 UTC (rev 7896)
@@ -159,8 +159,6 @@
 
          //And then we cancel any messages still in the message callback handler buffer
          consumerState.getClientConsumer().cancelBuffer();
-         
-         sessionState.getExecutor().clearClassLoader();
 
          return l;
 

Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/state/ConnectionState.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/state/ConnectionState.java	2009-11-06 03:20:28 UTC (rev 7895)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/state/ConnectionState.java	2009-11-09 04:09:58 UTC (rev 7896)
@@ -198,7 +198,6 @@
       while (iterator.hasNext())
       {
          SessionState state = (SessionState) iterator.next();
-         state.clearExecutorThread();
       }
       
    }

Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/state/SessionState.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/state/SessionState.java	2009-11-06 03:20:28 UTC (rev 7895)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/state/SessionState.java	2009-11-09 04:09:58 UTC (rev 7896)
@@ -380,11 +380,6 @@
    }
    
    // Public ---------------------------------------------------------------------------------------
-
-   public void clearExecutorThread() throws InterruptedException
-   {
-      this.executor.clearClassLoader();
-   }
    
    public void setTreatAsNonTransactedWhenNotEnlisted(boolean b)
    {

Modified: branches/Branch_1_4/src/main/org/jboss/messaging/util/CompatibleExecutor.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/util/CompatibleExecutor.java	2009-11-06 03:20:28 UTC (rev 7895)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/util/CompatibleExecutor.java	2009-11-09 04:09:58 UTC (rev 7896)
@@ -28,8 +28,6 @@
 
    void clearAllExceptCurrentTask();
 
-   void clearClassLoader();
-
    void shutdownNow();
 
    void shutdownAfterProcessingCurrentlyQueuedTasks();

Modified: branches/Branch_1_4/src/main/org/jboss/messaging/util/OrderedExecutorFactory.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/util/OrderedExecutorFactory.java	2009-11-06 03:20:28 UTC (rev 7895)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/util/OrderedExecutorFactory.java	2009-11-09 04:09:58 UTC (rev 7896)
@@ -61,10 +61,6 @@
    {
       private final LinkedList<Runnable> tasks = new LinkedList<Runnable>();
 
-      private boolean needToSetClassLoader = true;
-
-      private ClassLoader tcl;
-
       private boolean shutdown = false;
 
       private String name = "default-thread";
@@ -76,10 +72,6 @@
 
       public void execute(Runnable command)
       {
-         if (needToSetClassLoader)
-         {
-            tcl = SecurityActions.getTCL();
-         }
          synchronized (tasks)
          {
             if (!shutdown)
@@ -96,14 +88,6 @@
       @SuppressWarnings("unchecked")
       public void run()
       {
-         if (needToSetClassLoader)
-         {
-            needToSetClassLoader = false;
-
-            SecurityActions.setTCL(tcl);
-            
-         }
-
          for (;;)
          {
             final Runnable task;
@@ -129,18 +113,6 @@
          }
       }
 
-      public void clearClassLoader()
-      {
-         execute(new Runnable()
-         {
-            @SuppressWarnings("unchecked")
-            public void run()
-            {
-               needToSetClassLoader = true;
-            }
-         });
-      }
-
       // old behavior also terminates the thread. with a pool we shouldn't do
       // this.
       public void shutdownNow()