You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2016/02/18 19:53:23 UTC
mina-sshd git commit: Fixed some style violations
Repository: mina-sshd
Updated Branches:
refs/heads/master 1be9aeea4 -> 2e2aad458
Fixed some style violations
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/2e2aad45
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/2e2aad45
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/2e2aad45
Branch: refs/heads/master
Commit: 2e2aad458642a4c7527cd649c63fe32024032514
Parents: 1be9aee
Author: Lyor Goldstein <ly...@gmail.com>
Authored: Thu Feb 18 20:53:43 2016 +0200
Committer: Lyor Goldstein <ly...@gmail.com>
Committed: Thu Feb 18 20:53:43 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/sshd/server/SshServer.java | 20 +++++++++-----------
.../AbstractGeneratorHostKeyProvider.java | 2 +-
2 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/2e2aad45/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java b/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
index 367f0c9..71b1a0a 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
@@ -484,17 +484,15 @@ public class SshServer extends AbstractFactoryManager implements ServerFactoryMa
}
hostKeyProvider.setAlgorithm(hostKeyType);
- {
- List<KeyPair> keys = ValidateUtils.checkNotNullAndNotEmpty(hostKeyProvider.loadKeys(),
- "Failed to load keys from %s", hostKeyFile);
- KeyPair kp = keys.get(0);
- PublicKey pubKey = kp.getPublic();
- String keyAlgorithm = pubKey.getAlgorithm();
- // force re-generation of host key if not same algorithm
- if (!Objects.equals(keyAlgorithm, hostKeyProvider.getAlgorithm())) {
- Files.deleteIfExists(hostKeyFile);
- hostKeyProvider.clearLoadedKeys();
- }
+ List<KeyPair> keys = ValidateUtils.checkNotNullAndNotEmpty(hostKeyProvider.loadKeys(),
+ "Failed to load keys from %s", hostKeyFile);
+ KeyPair kp = keys.get(0);
+ PublicKey pubKey = kp.getPublic();
+ String keyAlgorithm = pubKey.getAlgorithm();
+ // force re-generation of host key if not same algorithm
+ if (!Objects.equals(keyAlgorithm, hostKeyProvider.getAlgorithm())) {
+ Files.deleteIfExists(hostKeyFile);
+ hostKeyProvider.clearLoadedKeys();
}
sshd.setKeyPairProvider(hostKeyProvider);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/2e2aad45/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java b/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java
index 91b9063..52b1b21 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java
@@ -133,7 +133,7 @@ public abstract class AbstractGeneratorHostKeyProvider extends AbstractKeyPairPr
if (kp != null) {
keyPairHolder.set(kp);
}
- } catch(Throwable t) {
+ } catch (Throwable t) {
log.warn("loadKeys({}) Failed ({}) to resolve: {}",
keyPath, t.getClass().getSimpleName(), t.getMessage());
if (log.isDebugEnabled()) {