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

1 files changed, 1 insertions, 6 deletions

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);
             }
         }