summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-08-24 20:02:30 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-08-24 20:02:30 +0000
commit459b531be4161735df56deb06a97d3d21f2b217a (patch)
tree2a6dbb5bae1f111058cf43b96bf3151919c1e7d7 /sca-java-1.x
parent79c1588eae3f7f7bcd40bea1a4653ddda1e31827 (diff)
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
Diffstat (limited to 'sca-java-1.x')
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java7
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java6
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java6
3 files changed, 3 insertions, 16 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);
}
}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
index 8de2a3a3f9..b82b27d02d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
@@ -44,16 +44,12 @@ public class NodeImplementationDaemonBootstrap {
public void start() {
threadContextClassLoader = Thread.currentThread().getContextClassLoader();
- boolean started = false;
try {
Thread.currentThread().setContextClassLoader(runtimeClassLoader);
SCANodeFactory factory = SCANodeFactory.newInstance();
daemon = factory.createSCANodeFromClassLoader("NodeDaemon.composite", threadContextClassLoader);
- started = true;
} finally {
- if (!started) {
- Thread.currentThread().setContextClassLoader(threadContextClassLoader);
- }
+ Thread.currentThread().setContextClassLoader(threadContextClassLoader);
}
}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
index 0264574fb9..f92e1a7406 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
@@ -50,15 +50,11 @@ public class NodeImplementationLauncherBootstrap {
public void start() {
threadContextClassLoader = Thread.currentThread().getContextClassLoader();
- boolean started = false;
try {
Thread.currentThread().setContextClassLoader(runtimeClassLoader);
delegate.start();
- started = true;
} finally {
- if (!started) {
- Thread.currentThread().setContextClassLoader(threadContextClassLoader);
- }
+ Thread.currentThread().setContextClassLoader(threadContextClassLoader);
}
}