cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1086109 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
Date Mon, 28 Mar 2011 03:09:36 GMT
Author: ningjiang
Date: Mon Mar 28 03:09:35 2011
New Revision: 1086109

URL: http://svn.apache.org/viewvc?rev=1086109&view=rev
Log:
Merged revisions 1086103 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes

................
  r1086103 | ningjiang | 2011-03-28 10:53:07 +0800 (Mon, 28 Mar 2011) | 9 lines
  
  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.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 28 03:09:35 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789,1065486,1069254,1069739,1070037
-/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815,1062778,1069249,1069720,1070034
+/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789,1065486,1069254,1069739,1070037,1086103
+/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815,1062778,1069249,1069720,1070034,1086102

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

Modified: cxf/branches/2.2.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.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java?rev=1086109&r1=1086108&r2=1086109&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
Mon Mar 28 03:09:35 2011
@@ -135,6 +135,7 @@ public class JMSContinuation implements 
             public void run() {
                 synchronized (JMSContinuation.this) { 
                     if (isPending) {
+                        cancelTimerTask();
                         doResume();
                     }
                 }



Mime
View raw message