tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r988696 - in /tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules: domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/ implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/
Date Tue, 24 Aug 2010 20:02:31 GMT
Author: nash
Date: Tue Aug 24 20:02:30 2010
New Revision: 988696

URL: http://svn.apache.org/viewvc?rev=988696&view=rev
Log:
Merge revision 942470 from trunk into the 1.6.1 branch

Modified:
    tuscany/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
    tuscany/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
    tuscany/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

Modified: tuscany/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
URL: http://svn.apache.org/viewvc/tuscany/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?rev=988696&r1=988695&r2=988696&view=diff
==============================================================================
--- tuscany/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
(original)
+++ tuscany/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
Tue Aug 24 20:02:30 2010
@@ -48,7 +48,6 @@ public class DomainManagerLauncherBootst
         
         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 DomainManagerLauncherBootst
                 // 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);
             }
         }
         

Modified: tuscany/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
URL: http://svn.apache.org/viewvc/tuscany/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?rev=988696&r1=988695&r2=988696&view=diff
==============================================================================
--- tuscany/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
(original)
+++ tuscany/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
Tue Aug 24 20:02:30 2010
@@ -44,16 +44,12 @@ public class NodeImplementationDaemonBoo
         
         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);
             }
         }
         

Modified: tuscany/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
URL: http://svn.apache.org/viewvc/tuscany/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?rev=988696&r1=988695&r2=988696&view=diff
==============================================================================
--- tuscany/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
(original)
+++ tuscany/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
Tue Aug 24 20:02:30 2010
@@ -50,15 +50,11 @@ public class NodeImplementationLauncherB
         
         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);
             }
         }
         



Mime
View raw message