changeset 7224:bbf6e6222726

6470730: Disconnect button leads to wrong popup message Reviewed-by: dcubed, sla, egahlin
author nloodin
date Mon, 27 May 2013 17:10:32 +0200
parents 9bbf2237071e
children 7d9fab5d86cd
files src/share/classes/sun/tools/jconsole/VMPanel.java
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/tools/jconsole/VMPanel.java	Mon May 27 15:24:53 2013 +0100
+++ b/src/share/classes/sun/tools/jconsole/VMPanel.java	Mon May 27 17:10:32 2013 +0200
@@ -55,6 +55,7 @@
     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 @@
                 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 @@
     private void vmPanelDied() {
         disconnect();
 
+        if (userDisconnected) {
+            userDisconnected = false;
+            return;
+        }
+
         JOptionPane optionPane;
         String msgTitle, msgExplanation, buttonStr;