stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8057746: Cannot handle JdpException in JMX agent initialization

Browse Source 
Add special handling for JdpException

Reviewed-by: jbachorik
This commit is contained in:
Yasumasa Suenaga 2014-09-11 08:01:33 -07:00 committed by Dmitry Samersoff
parent bf02343a72
commit 397655357a
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jdk/src/java.management/share/classes/sun/management/Agent.java
View File

@ -210,6 +210,8 @@ public class Agent {
} else { } else {
throw new AgentConfigurationError(INVALID_JMXREMOTE_PORT, "No port specified"); throw new AgentConfigurationError(INVALID_JMXREMOTE_PORT, "No port specified");
} }
} catch (JdpException e) {
error(e);
} catch (AgentConfigurationError err) { } catch (AgentConfigurationError err) {
error(err.getError(), err.getParams()); error(err.getError(), err.getParams());
} }
@ -273,7 +275,7 @@ public class Agent {
} }
private static void startDiscoveryService(Properties props) private static void startDiscoveryService(Properties props)
throws IOException { throws IOException, JdpException {
// Start discovery service if requested // Start discovery service if requested
String discoveryPort = props.getProperty("com.sun.management.jdp.port"); String discoveryPort = props.getProperty("com.sun.management.jdp.port");
String discoveryAddress = props.getProperty("com.sun.management.jdp.address"); String discoveryAddress = props.getProperty("com.sun.management.jdp.address");
@ -291,7 +293,7 @@ public class Agent {
try{ try{
shouldStart = Boolean.parseBoolean(discoveryShouldStart); shouldStart = Boolean.parseBoolean(discoveryShouldStart);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
throw new AgentConfigurationError("Couldn't parse autodiscovery argument"); throw new AgentConfigurationError(AGENT_EXCEPTION, "Couldn't parse autodiscovery argument");
} }
} }
@ -302,7 +304,7 @@ public class Agent {
address = (discoveryAddress == null) ? address = (discoveryAddress == null) ?
InetAddress.getByName(JDP_DEFAULT_ADDRESS) : InetAddress.getByName(discoveryAddress); InetAddress.getByName(JDP_DEFAULT_ADDRESS) : InetAddress.getByName(discoveryAddress);
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
throw new AgentConfigurationError("Unable to broadcast to requested address", e); throw new AgentConfigurationError(AGENT_EXCEPTION, e, "Unable to broadcast to requested address");
} }
int port = JDP_DEFAULT_PORT; int port = JDP_DEFAULT_PORT;
@ -310,7 +312,7 @@ public class Agent {
try { try {
port = Integer.parseInt(discoveryPort); port = Integer.parseInt(discoveryPort);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
throw new AgentConfigurationError("Couldn't parse JDP port argument"); throw new AgentConfigurationError(AGENT_EXCEPTION, "Couldn't parse JDP port argument");
} }
} }
@ -330,12 +332,7 @@ public class Agent {
String instanceName = props.getProperty("com.sun.management.jdp.name"); String instanceName = props.getProperty("com.sun.management.jdp.name");
try{ JdpController.startDiscoveryService(address, port, instanceName, jmxUrlStr);
JdpController.startDiscoveryService(address, port, instanceName, jmxUrlStr);
}
catch(JdpException e){
throw new AgentConfigurationError("Couldn't start JDP service", e);
}
} }
} }