From f30ba73e1622e12ac129138a3db8b3693d034eff Mon Sep 17 00:00:00 2001
From: Sergey Gabdurakhmanov <sgabdura@openjdk.org>
Date: Mon, 17 Nov 2014 13:11:37 +0100
Subject: [PATCH] 8048050: Agent NullPointerException when rmi.port in use

Reviewed-by: jbachorik, dfuchs
---
 .../classes/sun/management/jmxremote/ConnectorBootstrap.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/java.management/share/classes/sun/management/jmxremote/ConnectorBootstrap.java b/jdk/src/java.management/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
index a2f05634c62..e4d1c2f005f 100644
--- a/jdk/src/java.management/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
+++ b/jdk/src/java.management/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
@@ -767,7 +767,7 @@ public final class ConnectorBootstrap {
                     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 {