commit 1f11dbec8c0eaeaead40a109293ffae5a6721579
author Lou DeGenaro <degenaro@apache.org> Mon Jul 29 11:59:35 2019 +0000
committer Lou DeGenaro <degenaro@apache.org> Mon Jul 29 11:59:35 2019 +0000
tree 6a60e4eb067f1fa15419921456f31df16dd84ca5
parent acd41021135d40c427eab76bb453c6f9bb9e7b2f

UIMA-6102 DUCC daemons fail to fully boot when jmx URL is null

git-svn-id: https://svn.apache.org/repos/asf/uima/uima-ducc/trunk@1863932 13f79535-47bb-0310-9956-ffa450edef68

uima-ducc-common/src/main/java/org/apache/uima/ducc/common/boot/DuccDaemonRuntimeProperties.java

diff --git a/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/boot/DuccDaemonRuntimeProperties.java b/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/boot/DuccDaemonRuntimeProperties.java
index 511a5ce..e0b95aa 100644
--- a/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/boot/DuccDaemonRuntimeProperties.java
+++ b/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/boot/DuccDaemonRuntimeProperties.java
@@ -124,6 +124,17 @@
 		return;
 	}
 	
+	private void putBootProperty(Properties bootProperties, String key, String value) {
+		if(key != null) {
+			if(value != null) {
+				bootProperties.put(key, value);
+			}
+			else {
+				bootProperties.put(key, "?");
+			}
+		}
+	}
+	
 	public void boot(DaemonName daemonName, String jmxUrl) {
 		Properties bootProperties = new Properties();
 		String daemonNameText = daemonName.toString();
@@ -144,12 +155,12 @@
 		catch(Exception e) {
 			e.printStackTrace();
 		}
-		bootProperties.put(DuccDaemonRuntimeProperties.keyDaemonName, daemonNameText);
-		bootProperties.put(DuccDaemonRuntimeProperties.keyBootTime, bootTime);
-		bootProperties.put(DuccDaemonRuntimeProperties.keyJmxUrl, jmxUrl);
-		bootProperties.put(DuccDaemonRuntimeProperties.keyNodeIpAddress, nodeIpAddress);
-		bootProperties.put(DuccDaemonRuntimeProperties.keyNodeName, nodeName);
-		bootProperties.put(DuccDaemonRuntimeProperties.keyPid, pid);
+		putBootProperty(bootProperties, DuccDaemonRuntimeProperties.keyDaemonName, daemonNameText);
+		putBootProperty(bootProperties, DuccDaemonRuntimeProperties.keyBootTime, bootTime);
+		putBootProperty(bootProperties, DuccDaemonRuntimeProperties.keyJmxUrl, jmxUrl);
+		putBootProperty(bootProperties, DuccDaemonRuntimeProperties.keyNodeIpAddress, nodeIpAddress);
+		putBootProperty(bootProperties, DuccDaemonRuntimeProperties.keyNodeName, nodeName);
+		putBootProperty(bootProperties, DuccDaemonRuntimeProperties.keyPid, pid);
 		getInstance().put(daemonName, bootProperties);
 	}
 	
@@ -206,12 +217,12 @@
 		catch(Exception e) {
 			e.printStackTrace();
 		}
-		bootProperties.put(DuccDaemonRuntimeProperties.keyDaemonName, name);
-		bootProperties.put(DuccDaemonRuntimeProperties.keyBootTime, bootTime);
-		bootProperties.put(DuccDaemonRuntimeProperties.keyJmxUrl, jmxUrl);
-		bootProperties.put(DuccDaemonRuntimeProperties.keyNodeIpAddress, nodeIpAddress);
-		bootProperties.put(DuccDaemonRuntimeProperties.keyNodeName, nodeName);
-		bootProperties.put(DuccDaemonRuntimeProperties.keyPid, pid);
+		putBootProperty(bootProperties, DuccDaemonRuntimeProperties.keyDaemonName, name);
+		putBootProperty(bootProperties, DuccDaemonRuntimeProperties.keyBootTime, bootTime);
+		putBootProperty(bootProperties, DuccDaemonRuntimeProperties.keyJmxUrl, jmxUrl);
+		putBootProperty(bootProperties, DuccDaemonRuntimeProperties.keyNodeIpAddress, nodeIpAddress);
+		putBootProperty(bootProperties, DuccDaemonRuntimeProperties.keyNodeName, nodeName);
+		putBootProperty(bootProperties, DuccDaemonRuntimeProperties.keyPid, pid);
 		getInstance().putAgent(name, bootProperties);
 	}
 }