| commit | 1fbc52d374a5d9bbbcc3cc9171176c9b06981df5 | [log] [tgz] |
|---|---|---|
| author | Freeman Yue Fang <ffang@apache.org> | Fri Oct 24 04:10:06 2008 +0000 |
| committer | Freeman Yue Fang <ffang@apache.org> | Fri Oct 24 04:10:06 2008 +0000 |
| tree | 1487cad7b8b53a22c4dd60f2dd807f938116a8b6 | |
| parent | 4b09862bcbce3cfd9712f09e7fa3a69f9e810166 [diff] | |
| parent | 06bbdecd3848b8fe6ae6f9c6d16824b264d4589c [diff] |
recreate ServiceMix 3.3 release tag git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx3/tags/servicemix-3.3@707539 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 1509e94..d143d3d 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES
@@ -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
diff --git a/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java b/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java index 6f2b0b3..cb4e8b1 100644 --- a/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java +++ b/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
@@ -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) {
diff --git a/samples/camel/src/main/assembly/kit_camel_example_pom.xml b/samples/camel/src/main/assembly/kit_camel_example_pom.xml index 043ccc8..784acf0 100644 --- a/samples/camel/src/main/assembly/kit_camel_example_pom.xml +++ b/samples/camel/src/main/assembly/kit_camel_example_pom.xml
@@ -24,7 +24,7 @@ <parent> <groupId>org.apache.servicemix</groupId> <artifactId>samples</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.apache.servicemix.samples</groupId>