You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2012/04/13 17:01:34 UTC
svn commit: r1325797 -
/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java
Author: marrs
Date: Fri Apr 13 15:01:33 2012
New Revision: 1325797
URL: http://svn.apache.org/viewvc?rev=1325797&view=rev
Log:
ACE-262 applied the supplied patch
Modified:
ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java
Modified: ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java?rev=1325797&r1=1325796&r2=1325797&view=diff
==============================================================================
--- ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java (original)
+++ ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java Fri Apr 13 15:01:33 2012
@@ -242,16 +242,21 @@ public class AmazonNodeLauncher implemen
private String buildStartupScript(String id) throws MalformedURLException {
StringBuilder script = new StringBuilder();
- if (m_nodeBootstrap != null) {
+ if (m_nodeBootstrap != null && m_nodeBootstrap.length() > 0) {
script.append(m_nodeBootstrap).append(" ; ");
}
script.append("wget ").append(new URL(m_server, "/obr/" + m_aceLauncher)).append(" ;");
- for (String additonalDownload : m_additionalObrDownloads.split(",")) {
- script.append("wget ").append(new URL(m_server, "/obr/" + additonalDownload.trim())).append(" ;");
+ if (m_additionalObrDownloads.length() > 0) {
+ for (String additonalDownload : m_additionalObrDownloads.split(",")) {
+ script.append("wget ").append(new URL(m_server, "/obr/" + additonalDownload.trim())).append(" ;");
+ }
}
- for (String additonalDownload : m_externalDownloadUrls.split(",")) {
- script.append("wget ").append(additonalDownload.trim()).append(" ;");
+
+ if (m_externalDownloadUrls.length() > 0) {
+ for (String additonalDownload : m_externalDownloadUrls.split(",")) {
+ script.append("wget ").append(additonalDownload.trim()).append(" ;");
+ }
}
script.append("nohup java -jar ").append(m_aceLauncher).append(" ");
script.append("discovery=").append(m_server.toExternalForm()).append(" ");