From 459b531be4161735df56deb06a97d3d21f2b217a Mon Sep 17 00:00:00 2001 From: nash Date: Tue, 24 Aug 2010 20:02:30 +0000 Subject: Merge revision 942470 from trunk into the 1.6.1 branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@988696 13f79535-47bb-0310-9956-ffa450edef68 --- .../domain/manager/launcher/DomainManagerLauncherBootstrap.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager') diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java index f96e19ed72..1bb117f385 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java @@ -48,7 +48,6 @@ public class DomainManagerLauncherBootstrap { public void start() { threadContextClassLoader = Thread.currentThread().getContextClassLoader(); - boolean started = false; try { Thread.currentThread().setContextClassLoader(runtimeClassLoader); SCANodeFactory factory = SCANodeFactory.newInstance(); @@ -58,12 +57,8 @@ public class DomainManagerLauncherBootstrap { // Set the domain manager's root directory DomainManagerConfiguration domainManagerConfiguration = ((SCAClient) node).getService(DomainManagerConfiguration.class, "DomainManagerConfigurationComponent"); domainManagerConfiguration.setRootDirectory(rootDirectory); - - started = true; } finally { - if (!started) { - Thread.currentThread().setContextClassLoader(threadContextClassLoader); - } + Thread.currentThread().setContextClassLoader(threadContextClassLoader); } } -- cgit v1.2.3