# HG changeset patch
# User sgabdura
# Date 1416226297 -3600
#      Mon Nov 17 13:11:37 2014 +0100
# Node ID b2b81b1d86e9e93bd3e03dbe168425b4d899f1e7
# Parent  c06b6d58e6a9c10cea9f0b8946846c3de4f59feb
8048050: Agent NullPointerException when rmi.port in use
Reviewed-by: jbachorik, dfuchs

diff --git a/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java b/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
--- a/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
+++ b/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
@@ -767,7 +767,7 @@
                     JMXConnectorServerFactory.newJMXConnectorServer(url, env, mbs);
             connServer.start();
         } catch (IOException e) {
-            if (connServer == null) {
+            if (connServer == null || connServer.getAddress() == null) {
                 throw new AgentConfigurationError(CONNECTOR_SERVER_IO_ERROR,
                         e, url.toString());
             } else {