From b224b98f21535cfe74e737be3579c9dc3bfde315 Mon Sep 17 00:00:00 2001
From: nloodin <unknown>
Date: Mon, 27 May 2013 17:10:32 +0200
Subject: [PATCH] 6470730: Disconnect button leads to wrong popup message
 Reviewed-by: dcubed, sla, egahlin

---
 src/share/classes/sun/tools/jconsole/VMPanel.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/share/classes/sun/tools/jconsole/VMPanel.java b/src/share/classes/sun/tools/jconsole/VMPanel.java
index ec403d5d3..86d2fc5d1 100644
--- a/src/share/classes/sun/tools/jconsole/VMPanel.java
+++ b/src/share/classes/sun/tools/jconsole/VMPanel.java
@@ -55,6 +55,7 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
     private VMInternalFrame vmIF = null;
     private static ArrayList<TabInfo> tabInfos = new ArrayList<TabInfo>();
     private boolean wasConnected = false;
+    private boolean userDisconnected = false;
 
     // The everConnected flag keeps track of whether the window can be
     // closed if the user clicks Cancel after a failed connection attempt.
@@ -125,6 +126,7 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
                 if (connectedIconBounds != null && (e.getModifiers() & MouseEvent.BUTTON1_MASK) != 0 && connectedIconBounds.contains(e.getPoint())) {
 
                     if (isConnected()) {
+                        userDisconnected = true;
                         disconnect();
                         wasConnected = false;
                     } else {
@@ -452,6 +454,11 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
     private void vmPanelDied() {
         disconnect();
 
+        if (userDisconnected) {
+            userDisconnected = false;
+            return;
+        }
+
         JOptionPane optionPane;
         String msgTitle, msgExplanation, buttonStr;
 
-- 
GitLab