diff options
| author | Jose <jose@zeroc.com> | 2012-11-30 23:24:12 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-11-30 23:24:12 +0100 |
| commit | 809b96ad8db0ac0c3a1f3a33036efe2ba5ad2e96 (patch) | |
| tree | f6769575dd3457f18418e942908cdc0cad92f910 /java/src/IceGridGUI/Coordinator.java | |
| parent | Fixed GCC release warnings and set QT_HOME to /usr in Make.rules (diff) | |
| download | ice-809b96ad8db0ac0c3a1f3a33036efe2ba5ad2e96.tar.bz2 ice-809b96ad8db0ac0c3a1f3a33036efe2ba5ad2e96.tar.xz ice-809b96ad8db0ac0c3a1f3a33036efe2ba5ad2e96.zip | |
IceGridGUI fixes (ICE-5074 & ICE-5075)
ICE-5074 - NPE in IceGrid GUI login
ICE-5075 - Saved connection doesn't remember "No X.509" certificate
Diffstat (limited to 'java/src/IceGridGUI/Coordinator.java')
| -rw-r--r-- | java/src/IceGridGUI/Coordinator.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java index 1197b71376d..d56d32ef867 100644 --- a/java/src/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/Coordinator.java @@ -1274,7 +1274,10 @@ public class Coordinator parent.setCursor(oldCursor); return; } - initData.properties.setProperty("IceSSL.Password", new String(info.getKeyPassword())); + if(info.getKeyPassword() != null) + { + initData.properties.setProperty("IceSSL.Password", new String(info.getKeyPassword())); + } initData.properties.setProperty("IceSSL.Alias", info.getAlias()); } @@ -1783,7 +1786,9 @@ public class Coordinator else { router = Glacier2.RouterPrxHelper.uncheckedCast(router.ice_preferSecure(true)); - s = router.createSession(info.getUsername(), new String(info.getPassword())); + + s = router.createSession(info.getUsername(), info.getPassword() != null ? + new String(info.getPassword()) : ""); if(s == null) { @@ -2052,7 +2057,7 @@ public class Coordinator cb.getRegistry().ice_preferSecure(true))); cb.setSession(cb.getRegistry().createAdminSession(info.getUsername(), - new String(info.getPassword()))); + info.getPassword() != null ? new String(info.getPassword()) : "")); assert cb.getSession() != null; } cb.setKeepAlivePeriod(cb.getRegistry().getSessionTimeout() * 1000 / 2); |