Merge pull request #2951 from mikezhang1234567890/attach

Save local connector address in Attach API code
eclipse-openj9 · Sep 25, 2018 · cf45f6e · cf45f6e
2 parents b72aff7 + a0f34a7
commit cf45f6e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/AttachHandler.java b/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/AttachHandler.java
@@ -699,6 +699,8 @@ static Properties getAgentProperties() {
 				"sun.jvm.flags", //$NON-NLS-1$
 				"sun.java.command"			 //$NON-NLS-1$
 		};
+		Attachment.saveLocalConnectorAddress();
+		//If we don't have a local connector address, just continue and get the others
 		Properties agentProperties = new Properties();
 		for (String pName: agentPropertyNames) {
 			String pValue = com.ibm.oti.vm.VM.getVMLangAccess().internalGetProperties().getProperty(pName);

diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Attachment.java b/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Attachment.java
@@ -407,6 +407,14 @@ private static String startLocalAgent() throws IbmAttachOperationFailedException
 			throw new IbmAttachOperationFailedException("startLocalManagementAgent error starting agent:" + e.getClass() + " " + e.getMessage());		 //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
+		String addr = saveLocalConnectorAddress();
+		if (Objects.isNull(addr)) {
+			throw new IbmAttachOperationFailedException("startLocalManagementAgent: " + LOCAL_CONNECTOR_ADDRESS + " not defined"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		return addr;
+	}
+
+	static String saveLocalConnectorAddress() {
 		Properties systemProperties = com.ibm.oti.vm.VM.getVMLangAccess().internalGetProperties();
 		String addr;
 		synchronized (systemProperties) {
@@ -419,9 +427,9 @@ private static String startLocalAgent() throws IbmAttachOperationFailedException
 			}
 		}
 		if (Objects.isNull(addr)) {
-			/* startLocalAgent() should have set the property. */
+			/* property should be set at this point */
 			IPC.logMessage(LOCAL_CONNECTOR_ADDRESS + " not set"); //$NON-NLS-1$
-			throw new IbmAttachOperationFailedException("startLocalManagementAgent: " + LOCAL_CONNECTOR_ADDRESS + " not defined"); //$NON-NLS-1$ //$NON-NLS-2$
+			return null;
 		}
 		IPC.logMessage(LOCAL_CONNECTOR_ADDRESS + "=", addr); //$NON-NLS-1$
 		return addr;