Author: ffang
Date: Thu Oct 23 20:35:49 2008
New Revision: 707528
URL: http://svn.apache.org/viewvc?rev=707528&view=rev
Log:
[SM-1658]can't shundown container from jmx console
Modified:
servicemix/smx3/branches/servicemix-3.3/RELEASE-NOTES
servicemix/smx3/branches/servicemix-3.3/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
Modified: servicemix/smx3/branches/servicemix-3.3/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.3/RELEASE-NOTES?rev=707528&r1=707527&r2=707528&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.3/RELEASE-NOTES (original)
+++ servicemix/smx3/branches/servicemix-3.3/RELEASE-NOTES Thu Oct 23 20:35:49
2008
@@ -219,6 +219,7 @@
* [SM-1627] - loan-broker sample doesn't work
* [SM-1628] - ws-notification sample doesn't
* [SM-1641] - remoteRepositories is incorrect in smx-arch scripts
+ * [SM-1658] - can't shundown container from jmx console
Improvement
Modified:
servicemix/smx3/branches/servicemix-3.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.3/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java?rev=707528&r1=707527&r2=707528&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.3/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
(original)
+++
servicemix/smx3/branches/servicemix-3.3/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
Thu Oct 23 20:35:49 2008
@@ -743,8 +743,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) {
