diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-13 22:01:04 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-13 22:01:04 +0000 |
commit | 946292048c3c76c0fbc0d0f54fd52598bce6e305 (patch) | |
tree | 5838be1070740e351c0fb7c3c1ecbaecdb97ccbc /branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache | |
parent | 47cb8396ed8b45189c38990a27e3145f5a61c6b4 (diff) |
Copy r797997, r798040 and r798050 changes from 1.5.1 branch to 1.x branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@814393 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache')
-rw-r--r-- | branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java index 7be1e14988..59d050734c 100644 --- a/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java +++ b/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java @@ -24,6 +24,7 @@ import java.io.FileNotFoundException; import java.io.FilenameFilter; import java.io.IOException; import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; @@ -376,6 +377,13 @@ final class NodeLauncherUtil { return node; } catch (Exception e) { + Throwable ce = e instanceof InvocationTargetException ? e.getCause() : e; + if (ce.getClass().getName().equals("org.osoa.sca.ServiceRuntimeException") && + ce.getCause() != null && + ce.getCause().getClass().getName().equals("org.apache.tuscany.sca.monitor.MonitorRuntimeException")) { + NodeLauncher.logger.log(Level.SEVERE, "SCA Node could not be created"); + throw new LauncherException("SCA Node could not be created"); + } NodeLauncher.logger.log(Level.SEVERE, "SCA Node could not be created", e); throw new LauncherException(e); } finally { |