From 199a9c32b2619fc8a2f5c9be9afd15d1bd623535 Mon Sep 17 00:00:00 2001
From: Jaroslav Bachorik <jaroslav.bachorik@oracle.com>
Date: Thu, 20 Dec 2012 17:24:56 +0400
Subject: [PATCH] 7009998: JMX synchronization during connection restart is
 faulty

Add a return statement after the re-connecting has finished and the state is CONNECTED

Reviewed-by: sjiang
---
 jdk/make/netbeans/jmx/build.properties                           | 1 +
 .../com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/jdk/make/netbeans/jmx/build.properties b/jdk/make/netbeans/jmx/build.properties
index e998e58a17f..0012f8ebbc8 100644
--- a/jdk/make/netbeans/jmx/build.properties
+++ b/jdk/make/netbeans/jmx/build.properties
@@ -38,6 +38,7 @@ excludes=\
     com/sun/jmx/snmp/
 
 jtreg.tests=\
+    com/sun/jmx/ \
     com/sun/management/ \
     java/lang/management/ \
     javax/management/
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java b/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java
index 67d6d4475d0..969763c500a 100644
--- a/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java
+++ b/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java
@@ -115,6 +115,7 @@ public abstract class ClientCommunicatorAdmin {
                     // restarted is failed by another thread
                     throw ioe;
                 }
+                return;
             } else {
                 state = RE_CONNECTING;
                 lock.notifyAll();