[jboss-cvs] JBoss Messaging SVN: r2011 - trunk/src/main/org/jboss/jms/client/remoting.

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

Author: timfox
Date: 2007-01-21 05:01:04 -0500 (Sun, 21 Jan 2007)
New Revision: 2011

Modified:
   trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java
Log:
Removed the executor since now true asynch invocations are supported



Modified: trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java	2007-01-21 02:59:49 UTC (rev 2010)
+++ trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java	2007-01-21 10:01:04 UTC (rev 2011)
@@ -68,9 +68,6 @@
       trace = log.isTraceEnabled();
    }
    
-   //FIXME temporary - until remoting provides true asynch invocations
-   static Executor exec = new QueuedExecutor();
-   
    private static boolean checkExpiredOrReachedMaxdeliveries(MessageProxy proxy,
                                                              SessionDelegate del,
                                                              int maxDeliveries)
@@ -95,33 +92,17 @@
             }
          }
          final Cancel cancel = new DefaultCancel(proxy.getDeliveryId(), proxy.getDeliveryCount(),
-                                           expired, reachedMaxDeliveries);
+                                                 expired, reachedMaxDeliveries);
          
-         //FIXME - this cancel should be sent using remoting true asynch invocations
-         //for now we just send on a different thread to prevent deadlocks
-         
-         final SessionDelegate sess = del;
-         
          try
          {
-            
-            exec.execute(new Runnable() { public void run()
-            {
-               try
-               {
-                  sess.cancelDelivery(cancel);
-               }
-               catch (JMSException e)
-               {
-                  log.error("Failed to cancel delivery", e);
-               }
-            }});
+            del.cancelDelivery(cancel);
          }
-         catch (InterruptedException e)
+         catch (JMSException e)
          {
-            log.error("Thread interrupted", e);
-         }
-                  
+            log.error("Failed to cancel delivery", e);
+         }   
+               
          return true;
       }
       else