[hornetq-commits] JBoss hornetq SVN: r9043 - trunk/src/main/org/hornetq/ra/inflow.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-04-01 12:58:42 -0400 (Thu, 01 Apr 2010)
New Revision: 9043

Modified:
   trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java
Log:
Reverting using tearDown on the workerThread

Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java
===================================================================
--- trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java	2010-04-01 14:28:35 UTC (rev 9042)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java	2010-04-01 16:58:42 UTC (rev 9043)
@@ -262,14 +262,7 @@
       }
 
       deliveryActive.set(false);
-      try
-      {
-         ra.getWorkManager().scheduleWork(new TearDownActivation());
-      }
-      catch (WorkException e)
-      {
-         log.warn("exception while scheduling activation teardown " + this, e);
-      }
+      teardown();
    }
 
    /**
@@ -518,26 +511,4 @@
       {
       }
    }
-
-   /**
-    * Handles the setup
-    */
-   private class TearDownActivation implements Work
-   {
-      public void run()
-      {
-         try
-         {
-            teardown();
-         }
-         catch (Throwable t)
-         {
-            HornetQActivation.log.error("Unable to tear down activation ", t);
-         }
-      }
-
-      public void release()
-      {
-      }
-   }
 }