From 3a6305e6c7d04b77ca1638b5e4a46060bfbaf161 Mon Sep 17 00:00:00 2001
From: Dmitry Samersoff <dsamersoff@openjdk.org>
Date: Sat, 19 Oct 2013 20:59:42 +0400
Subject: [PATCH] 8024071: In ManagementAgent.start it should be possible to
 set the jdp.name parameter

Pass one more property from Agent to JdpController

Reviewed-by: jbachorik, sla
---
 jdk/src/share/classes/sun/management/Agent.java              | 2 +-
 jdk/test/sun/management/jdp/JdpTest.sh                       | 1 +
 .../sun/management/jmxremote/startstop/JMXStartStopTest.sh   | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/sun/management/Agent.java b/jdk/src/share/classes/sun/management/Agent.java
index 238e9c1ff99..171b5c92510 100644
--- a/jdk/src/share/classes/sun/management/Agent.java
+++ b/jdk/src/share/classes/sun/management/Agent.java
@@ -323,7 +323,7 @@ public class Agent {
                     : String.format(
                     "service:jmx:rmi:///jndi/rmi://%s:%s/jmxrmi", hostname, jmxremotePort);
 
-            String instanceName = System.getProperty("com.sun.management.jdp.name");
+            String instanceName = props.getProperty("com.sun.management.jdp.name");
 
             try{
                JdpController.startDiscoveryService(address, port, instanceName, jmxUrlStr);
diff --git a/jdk/test/sun/management/jdp/JdpTest.sh b/jdk/test/sun/management/jdp/JdpTest.sh
index 18f88a5430c..20265f4a2b2 100644
--- a/jdk/test/sun/management/jdp/JdpTest.sh
+++ b/jdk/test/sun/management/jdp/JdpTest.sh
@@ -213,6 +213,7 @@ test_03(){
                 jdp.port=${_port} \
                 jdp.address=${_ip} \
                 jdp.pause=5 \
+                jdp.name=jcmdtest \
                 jmxremote.port=${_jmxport} \
                 jmxremote.authenticate=false \
                 jmxremote.ssl=false
diff --git a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh
index e2e7598a994..4d672166211 100644
--- a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh
@@ -551,6 +551,11 @@ do
  esac 
 done
 
+if [ "${COMPILEJAVA}" = "" ]
+then 
+  COMPILEJAVA=${TESTJAVA}
+fi
+
 if [ ${_compile} = "yes" ]
 then
  _compile