Author: ningjiang Date: Thu Jun 23 15:57:15 2011 New Revision: 1138955 URL: http://svn.apache.org/viewvc?rev=1138955&view=rev Log: Merged revisions 1138943 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1138943 | ningjiang | 2011-06-23 23:42:00 +0800 (Thu, 23 Jun 2011) | 9 lines 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.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 23 15:57:15 2011 @@ -1,2 +1,2 @@ -/cxf/branches/2.4.x-fixes:1137961 -/cxf/trunk:1137960 +/cxf/branches/2.4.x-fixes:1137961,1138943 +/cxf/trunk:1137960,1138919 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java?rev=1138955&r1=1138954&r2=1138955&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java (original) +++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java Thu Jun 23 15:57:15 2011 @@ -199,6 +199,8 @@ public class AutomaticWorkQueueImpl exte public void shutdown() { shutdown.set(true); + // to exit the waiting thread + interrupt(); } public void run() {
