summaryrefslogtreecommitdiff
path: root/java/src/IceGridGUI/SessionKeeper.java
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-11-05 22:45:30 +0100
committerJose <jose@zeroc.com>2012-11-05 22:45:30 +0100
commit6cde3b25c250ca716543198a38d442929c885526 (patch)
treec12621c282b4aab0232c09d49f23d8057565b376 /java/src/IceGridGUI/SessionKeeper.java
parentICE-4920 - column width too small for IceStorm subscriber map (diff)
downloadice-6cde3b25c250ca716543198a38d442929c885526.tar.bz2
ice-6cde3b25c250ca716543198a38d442929c885526.tar.xz
ice-6cde3b25c250ca716543198a38d442929c885526.zip
IceGridGUI - don't set null password
Diffstat (limited to 'java/src/IceGridGUI/SessionKeeper.java')
-rw-r--r--java/src/IceGridGUI/SessionKeeper.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/SessionKeeper.java
index 9289c46a7d5..189a0bc1e90 100644
--- a/java/src/IceGridGUI/SessionKeeper.java
+++ b/java/src/IceGridGUI/SessionKeeper.java
@@ -4838,7 +4838,10 @@ public class SessionKeeper
builder.append(new JLabel("Username"), _username);
builder.nextLine();
_password = new JPasswordField(20);
- _password.setText(new String(info.getPassword()));
+ if(info.getPassword() != null)
+ {
+ _password.setText(new String(info.getPassword()));
+ }
builder.append(new JLabel("Password"), _password);
builder.nextLine();
_storePassword = new JCheckBox("Save Password.");
@@ -4855,7 +4858,10 @@ public class SessionKeeper
builder.append(new JLabel("Key Alias"), _keyAlias);
builder.nextLine();
_keyPassword = new JPasswordField(20);
- _keyPassword.setText(new String(info.getKeyPassword()));
+ if(info.getKeyPassword() != null)
+ {
+ _keyPassword.setText(new String(info.getKeyPassword()));
+ }
builder.append(new JLabel("Key Password"), _keyPassword);
builder.nextLine();
_storeKeyPassword = new JCheckBox("Save Key Password.");