Author: echatellier Date: 2016-05-23 20:55:46 +0200 (Mon, 23 May 2016) New Revision: 4347 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4347 Log: Merge branch into trunk Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2016-05-23 16:50:38 UTC (rev 4346) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2016-05-23 18:55:46 UTC (rev 4347) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2014 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2008 - 2016 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -570,8 +570,10 @@ if (sshKeyUsed) { try { char[] passChars = SSHAgent.getAgent().getPassphrase(sshKey); - String passphrase = String.valueOf(passChars); - ui.setPassphrase(passphrase); + if (passChars != null) { + String passphrase = String.valueOf(passChars); + ui.setPassphrase(passphrase); + } } catch (InvalidPassphraseException e) { if (log.isWarnEnabled()) { log.warn("Can't key passphrase for key", e); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java 2016-05-23 16:50:38 UTC (rev 4346) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java 2016-05-23 18:55:46 UTC (rev 4347) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009 - 2016 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -305,8 +305,10 @@ SSHUserInfo ui = new SSHUserInfo(); if (sshKeyUsed) { char[] passchars = SSHAgent.getAgent().getPassphrase(currentSSHKey); - String passphrase = String.valueOf(passchars); - ui.setPassphrase(passphrase); + if (passchars != null) { + String passphrase = String.valueOf(passchars); + ui.setPassphrase(passphrase); + } setTestMessage(t("isisfish.simulator.ssh.configuration.connectingpk"), false); } else { setTestMessage(t("isisfish.simulator.ssh.configuration.connecting"), false); @@ -466,8 +468,10 @@ SSHUserInfo ui = new SSHUserInfo(); if (sshKeyUsed) { char[] passchars = SSHAgent.getAgent().getPassphrase(currentSSHKey); - String passphrase = String.valueOf(passchars); - ui.setPassphrase(passphrase); + if (passchars != null) { + String passphrase = String.valueOf(passchars); + ui.setPassphrase(passphrase); + } } session.setUserInfo(ui); session.connect(10000); // timeout