diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-04 23:43:05 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-04 23:43:05 +0000 |
commit | 6a9f8b2718697d444e4413166465cf2c5f1ef533 (patch) | |
tree | de7f3a06be12730ffc72150c3fc809938b7bc10a /branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache | |
parent | ffe36f15ffc3cb9115e25ed24e9208aa8d8642f9 (diff) |
Fix for TUSCANY-3077. Allow the thread pool for conversation manager to be shutdown
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@781872 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java b/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java index 1338b3a27c..349548c08c 100644 --- a/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java +++ b/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java @@ -6,15 +6,15 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ package org.apache.tuscany.sca.node.impl; @@ -50,6 +50,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.core.assembly.ActivationException; import org.apache.tuscany.sca.core.assembly.CompositeActivator; import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory; +import org.apache.tuscany.sca.core.conversation.ConversationManager; import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory; import org.apache.tuscany.sca.core.invocation.ProxyFactory; import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint; @@ -96,6 +97,7 @@ public class RuntimeBootStrapper { private List<SCADefinitions> policyDefinitions; private ModelResolver policyDefinitionsResolver; private Monitor monitor; + private ConversationManager conversationManager; public RuntimeBootStrapper(ClassLoader classLoader) { this.classLoader = classLoader; @@ -111,6 +113,8 @@ public class RuntimeBootStrapper { // Get work scheduler workScheduler = utilities.getUtility(WorkScheduler.class); + conversationManager = utilities.getUtility(ConversationManager.class); + // Create an interface contract mapper InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class); @@ -165,7 +169,7 @@ public class RuntimeBootStrapper { policyDefinitions, policyDefinitionsResolver, monitor); - + // add the contribution service into the utility extension point utilities.addUtility(contributionService); @@ -201,6 +205,9 @@ public class RuntimeBootStrapper { // Stop and destroy the work manager workScheduler.destroy(); + conversationManager.destroy(); + conversationManager = null; + // Cleanup modules = null; registry = null; |