Updated Branches: refs/heads/master 74946f1b6 -> e22356a77
Minor fixes Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/20888f7a Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/20888f7a Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/20888f7a Branch: refs/heads/master Commit: 20888f7a7329dc09a4ac75c17004c30bfd03e5de Parents: 74946f1 Author: Guillaume Nodet <[email protected]> Authored: Tue Dec 3 20:42:41 2013 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Tue Dec 3 20:42:41 2013 +0100 ---------------------------------------------------------------------- .../java/org/apache/sshd/client/session/ClientSessionImpl.java | 4 ++-- .../java/org/apache/sshd/common/session/AbstractSession.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/20888f7a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java index 9d1e650..73fbb18 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java @@ -323,7 +323,7 @@ public class ClientSessionImpl extends AbstractSession implements ClientSession switch (getState()) { case ReceiveKexInit: if (cmd != SshConstants.Message.SSH_MSG_KEXINIT) { - log.error("Ignoring command " + cmd + " while waiting for " + SshConstants.Message.SSH_MSG_KEXINIT); + log.error("Ignoring command {} while waiting for {}", cmd, SshConstants.Message.SSH_MSG_KEXINIT); break; } log.info("Received SSH_MSG_KEXINIT"); @@ -370,7 +370,7 @@ public class ClientSessionImpl extends AbstractSession implements ClientSession if (cmd == SshConstants.Message.SSH_MSG_USERAUTH_BANNER) { String welcome = buffer.getString(); String lang = buffer.getString(); - log.debug("Welcome banner: " + welcome); + log.debug("Welcome banner: {}", welcome); UserInteraction ui = getClientFactoryManager().getUserInteraction(); if (ui != null) { ui.welcome(welcome); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/20888f7a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java b/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java index f5e9cdf..f6784d3 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java @@ -534,7 +534,7 @@ public abstract class AbstractSession implements Session { // need more data break; } - // We have received the beinning of the packet + // We have received the beginning of the packet } else if (decoderState == 1) { // The read position should always be 4 at this point assert decoderBuffer.rpos() == 4; @@ -556,8 +556,7 @@ public abstract class AbstractSession implements Session { inMac.doFinal(inMacResult, 0); // Check the computed result with the received mac (just after the packet data) if (!BufferUtils.equals(inMacResult, 0, data, decoderLength + 4, macSize)) { - throw new SshException(SshConstants.SSH2_DISCONNECT_MAC_ERROR, - "MAC Error"); + throw new SshException(SshConstants.SSH2_DISCONNECT_MAC_ERROR, "MAC Error"); } } // Increment incoming packet sequence number
