svn commit: r1086103 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java

[ningjiang]

Author: ningjiang
Date: Mon Mar 28 02:53:07 2011
New Revision: 1086103

URL: http://svn.apache.org/viewvc?rev=1086103&view=rev
Log:
Merged revisions 1086102 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1086102 | ningjiang | 2011-03-28 10:42:38 +0800 (Mon, 28 Mar 2011) | 1 line
  
  CXF-3426  CXF JMSContinuation leaks threads
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 28 02:53:07 2011
@@ -1 +1 @@
-/cxf/trunk:1084966
+/cxf/trunk:1084966,1086102

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java?rev=1086103&r1=1086102&r2=1086103&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
 Mon Mar 28 02:53:07 2011
@@ -133,6 +133,7 @@ public class JMSContinuation implements 
             public void run() {
                 synchronized (JMSContinuation.this) { 
                     if (isPending) {
+                        cancelTimerTask();
                         doResume();
                     }
                 }