Author: ffang
Date: Thu Oct 23 21:00:17 2008
New Revision: 707535
URL: http://svn.apache.org/viewvc?rev=707535&view=rev
Log:
sync up changes from 3.2 working branch to 3.2.3 release branch and update the
RELEASE NOTES
Modified:
servicemix/smx3/branches/servicemix-3.2.3/RELEASE-NOTES
servicemix/smx3/branches/servicemix-3.2.3/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
Modified: servicemix/smx3/branches/servicemix-3.2.3/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.3/RELEASE-NOTES?rev=707535&r1=707534&r2=707535&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2.3/RELEASE-NOTES (original)
+++ servicemix/smx3/branches/servicemix-3.2.3/RELEASE-NOTES Thu Oct 23 21:00:17
2008
@@ -66,6 +66,7 @@
* [SM-1622] - servicemix-eip content enricher should copy original message
properties in the way the pipeline does
* [SM-1632] - Backport a change to Smx 3.2 branch to allow artifacts that
use the servicemix-bean component to deploy on Smx4
* [SM-1637] - smx-cxf-bc provider throws NPE at
JbiInWsdl1Interceptor.handleJBIFault(JbiInWsdl1Interceptor.java:237)
+ * [SM-1658] - can't shundown container from jmx console
Improvement
Modified:
servicemix/smx3/branches/servicemix-3.2.3/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.3/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java?rev=707535&r1=707534&r2=707535&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2.3/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2.3/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
Thu Oct 23 21:00:17 2008
@@ -731,8 +731,12 @@
return true;
};
});
-
- executorFactory.createExecutor("ServiceMix -- shutting down
registry").execute(shutdown);
+
+ //use daemon thread to run this shutdown task
+ //fix the container hang when shutdown container from the jmx console
+ Thread daemonShutDownThread = new Thread(shutdown);
+ daemonShutDownThread.setDaemon(true);
+ daemonShutDownThread.start();
try {
if (forceShutdown > 0) {
