You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/06/30 21:54:06 UTC
svn commit: r789910 - in /cxf/branches/2.2.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
Author: dkulp
Date: Tue Jun 30 19:54:06 2009
New Revision: 789910
URL: http://svn.apache.org/viewvc?rev=789910&view=rev
Log:
Merged revisions 789899 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r789899 | dkulp | 2009-06-30 15:38:45 -0400 (Tue, 30 Jun 2009) | 2 lines
[CXF-2277] Make the workqueue use daemon threads so apps will actuall
stop.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 19:54:06 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789898
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789899
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java?rev=789910&r1=789909&r2=789910&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java (original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java Tue Jun 30 19:54:06 2009
@@ -137,14 +137,14 @@
//ignore - if we get here, the "group" is as high as
//the security manager will allow us to go. Use that one.
}
- return new ThreadGroup(group, name + "-workqueue");
+ return new ThreadGroup(group, name + "-workqueue");
}
}
);
} catch (SecurityException e) {
- group = new ThreadGroup(name + "-workqueue");
+ group = new ThreadGroup(name + "-workqueue");
}
-
+ group.setDaemon(true);
return new AWQThreadFactory(group, name);
}
static class AWQThreadFactory implements ThreadFactory {
@@ -164,8 +164,8 @@
name + "-workqueue-" + threadNumber.getAndIncrement(),
0);
t.setContextClassLoader(loader);
- if (t.isDaemon()) {
- t.setDaemon(false);
+ if (!t.isDaemon()) {
+ t.setDaemon(true);
}
if (t.getPriority() != Thread.NORM_PRIORITY) {
t.setPriority(Thread.NORM_PRIORITY);