cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1138943 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
Date Thu, 23 Jun 2011 15:42:01 GMT
Author: ningjiang
Date: Thu Jun 23 15:42:00 2011
New Revision: 1138943

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

........
  r1138919 | ningjiang | 2011-06-23 23:11:04 +0800 (Thu, 23 Jun 2011) | 1 line
  
  CXF-3614 Fixed the Thread leak of AutomaticWorkQueueImpl
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 23 15:42:00 2011
@@ -1 +1 @@
-/cxf/trunk:1137793,1137960,1138220,1138644,1138913
+/cxf/trunk:1137793,1137960,1138220,1138644,1138913,1138919

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 23 15:42:00 2011
@@ -1 +1 @@
-/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135106,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1136960,1137509,1137658-1137678,1137793,1137960,1138220,1138644,1138913
+/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135106,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1136960,1137509,1137658-1137678,1137793,1137960,1138220,1138644,1138913,1138919

Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java?rev=1138943&r1=1138942&r2=1138943&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
Thu Jun 23 15:42:00 2011
@@ -199,6 +199,8 @@ public class AutomaticWorkQueueImpl exte
         
         public void shutdown() {
             shutdown.set(true);
+            // to exit the waiting thread
+            interrupt();
         }
         
         public void run() {



Mime
View raw message