[jboss-cvs] JBoss Messaging SVN: r8257 - branches/Branch_1_4/src/main/org/jboss/jms/client/container.

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

Author: gaohoward
Date: 2011-04-07 02:26:43 -0400 (Thu, 07 Apr 2011)
New Revision: 8257

Modified:
   branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java
Log:
JBMESSAGING-1850



Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java	2011-04-06 15:17:51 UTC (rev 8256)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java	2011-04-07 06:26:43 UTC (rev 8257)
@@ -295,7 +295,7 @@
    private int consumeCount;
    private boolean firstTime = true;
    private volatile Thread onMessageThread;
-   private ExecutorService pool = Executors.newFixedThreadPool(1);
+   private ExecutorService pool = Executors.newCachedThreadPool();
    private long maxRetryChangeRate;
    private long retryChangeRateInterval;
    private boolean abortReceive;
@@ -472,6 +472,8 @@
          
          this.listener = null;
       }
+      
+      pool.shutdownNow();
                            
       if (trace) { log.trace(this + " closed"); }
    }
@@ -598,7 +600,7 @@
                      if (tmUsed >= timeout)
                      {
                         log.warn("Timed out before post message processing, discarding message " + m);
-                        return null;
+                        throw new JMSException("Timed out before post message processing, discarding message " + m);
                      }
 
                      try
@@ -621,7 +623,7 @@
                      catch (TimeoutException e)
                      {
                         log.warn("Timed out waiting for post message processing, discarding message " + m);
-                        return null;
+                        throw new JMSException("Timed out waiting for post message processing, discarding message " + m);
                      }
                   }