[jboss-cvs] JBossAS SVN: r80515 - branches/JBPAPP_4_2_0_GA_CP04_JBPAPP-1363/messaging/src/main/org/jboss/mq/server.

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

Author: jbertram at redhat.com
Date: 2008-11-04 14:52:09 -0500 (Tue, 04 Nov 2008)
New Revision: 80515

Modified:
   branches/JBPAPP_4_2_0_GA_CP04_JBPAPP-1363/messaging/src/main/org/jboss/mq/server/ClientConsumer.java
Log:
[JBPAPP-1363]

Modified: branches/JBPAPP_4_2_0_GA_CP04_JBPAPP-1363/messaging/src/main/org/jboss/mq/server/ClientConsumer.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP04_JBPAPP-1363/messaging/src/main/org/jboss/mq/server/ClientConsumer.java	2008-11-04 18:51:18 UTC (rev 80514)
+++ branches/JBPAPP_4_2_0_GA_CP04_JBPAPP-1363/messaging/src/main/org/jboss/mq/server/ClientConsumer.java	2008-11-04 19:52:09 UTC (rev 80515)
@@ -122,8 +122,22 @@
          messages.add(r);
          if (!enqueued)
          {
-            threadPool.run(this);
             enqueued = true;
+            boolean interrupted = Thread.interrupted();
+            try
+            {
+               threadPool.run(this);
+            }
+            catch (Exception e)
+            {
+               log.debug("Unable to use thread pool for delivering messages, will use the sending thread", e);
+               run();
+            }
+            finally
+            {
+               if (interrupted)
+                  Thread.currentThread().interrupt();
+            }
          }
       }
    }