Mercurial > hg > openjdk > jdk6 > jdk
changeset 1505:7305c61960a5
8030878: JConsole issues meaningless message if SSL connection fails
Reviewed-by: mchung, sla
author | igerasim |
---|---|
date | Fri, 24 Jan 2014 21:46:58 +0400 |
parents | b8df4412580f |
children | 3a6be846a16c |
files | src/share/classes/sun/tools/jconsole/Messages.java src/share/classes/sun/tools/jconsole/VMPanel.java src/share/classes/sun/tools/jconsole/resources/messages.properties |
diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/tools/jconsole/Messages.java Tue May 10 14:53:34 2011 -0700 +++ b/src/share/classes/sun/tools/jconsole/Messages.java Fri Jan 24 21:46:58 2014 +0400 @@ -304,9 +304,9 @@ public static String WRITABLE; public static String CONNECTION_FAILED1; public static String CONNECTION_FAILED2; + public static String CONNECTION_FAILED_SSL1; + public static String CONNECTION_FAILED_SSL2; public static String CONNECTION_LOST1; - public static String CONNECTION_INSECURE1; - public static String CONNECTION_INSECURE2; public static String CONNECTING_TO1; public static String CONNECTING_TO2; public static String DEADLOCK_TAB;
--- a/src/share/classes/sun/tools/jconsole/VMPanel.java Tue May 10 14:53:34 2011 -0700 +++ b/src/share/classes/sun/tools/jconsole/VMPanel.java Fri Jan 24 21:46:58 2014 +0400 @@ -472,8 +472,8 @@ msgExplanation = Resources.format(Messages.CONNECTING_TO2, getConnectionName()); buttonStr = Messages.RECONNECT; } else if (shouldUseSSL) { - msgTitle = Messages.CONNECTION_INSECURE1; - msgExplanation = Resources.format(Messages.CONNECTION_INSECURE2, getConnectionName()); + msgTitle = Messages.CONNECTION_FAILED_SSL1; + msgExplanation = Resources.format(Messages.CONNECTION_FAILED_SSL2, getConnectionName()); buttonStr = Messages.INSECURE; } else { msgTitle = Messages.CONNECTION_FAILED1;
--- a/src/share/classes/sun/tools/jconsole/resources/messages.properties Tue May 10 14:53:34 2011 -0700 +++ b/src/share/classes/sun/tools/jconsole/resources/messages.properties Fri Jan 24 21:46:58 2014 +0400 @@ -262,9 +262,9 @@ WRITABLE=Writable CONNECTION_FAILED1=Connection Failed: Retry? CONNECTION_FAILED2=The connection to {0} did not succeed.<br>Would you like to try again? +CONNECTION_FAILED_SSL1=Secure connection failed. Retry insecurely? +CONNECTION_FAILED_SSL2=The connection to {0} could not be made using SSL.<br>Would you like to try without SSL?<br>(Username and password will be sent in plain text.) CONNECTION_LOST1=Connection Lost: Reconnect? -CONNECTION_INSECURE1=ConnectionFailedSSL1 -CONNECTION_INSECURE2=ConnectionFailedSSL2 CONNECTING_TO1=Connecting to {0} CONNECTING_TO2=You are currently being connected to {0}.<br>This will take a few moments. DEADLOCK_TAB=Deadlock