Repository: mina-sshd Updated Branches: refs/heads/master 106045642 -> 868ad00ed
Minor code changes to allow for Eclipse Oxygen IDE usage Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/868ad00e Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/868ad00e Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/868ad00e Branch: refs/heads/master Commit: 868ad00ed4fb318c254a36484524b665aa45a983 Parents: 1060456 Author: Goldstein Lyor <l...@c-b4.com> Authored: Wed Jul 12 10:49:22 2017 +0300 Committer: Goldstein Lyor <l...@c-b4.com> Committed: Wed Jul 12 10:49:22 2017 +0300 ---------------------------------------------------------------------- .../sshd/common/channel/ChannelAsyncOutputStream.java | 14 ++++++++------ .../org/apache/sshd/common/util/GenericUtils.java | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/868ad00e/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java index 2ba01fd..e0da5c0 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelAsyncOutputStream.java @@ -53,8 +53,8 @@ public class ChannelAsyncOutputStream extends AbstractCloseable implements IoOut } @Override - public synchronized IoWriteFuture write(final Buffer buffer) { - final IoWriteFutureImpl future = new IoWriteFutureImpl(buffer); + public synchronized IoWriteFuture write(Buffer buffer) { + IoWriteFutureImpl future = new IoWriteFutureImpl(buffer); if (isClosing()) { future.setValue(new IOException("Closed")); } else { @@ -98,10 +98,10 @@ public class ChannelAsyncOutputStream extends AbstractCloseable implements IoOut } if (length >= (Integer.MAX_VALUE - 12)) { - throw new IllegalArgumentException("Command " + SshConstants.getCommandMessageName(cmd) + " length (" + length + " exceeds int boundaries"); + throw new IllegalArgumentException("Command " + SshConstants.getCommandMessageName(cmd) + " length (" + length + ") exceeds int boundaries"); } - Session s = channel.getSession(); + Session s = channel.getSession(); Buffer buf = s.createBuffer(cmd, (int) length + 12); buf.putInt(channel.getRecipient()); if (cmd == SshConstants.SSH_MSG_CHANNEL_EXTENDED_DATA) { @@ -111,9 +111,11 @@ public class ChannelAsyncOutputStream extends AbstractCloseable implements IoOut buf.putRawBytes(buffer.array(), buffer.rpos(), (int) length); buffer.rpos(buffer.rpos() + (int) length); remoteWindow.consume(length); + try { - final ChannelAsyncOutputStream stream = this; - s.writePacket(buf).addListener(new SshFutureListener<IoWriteFuture>() { + ChannelAsyncOutputStream stream = this; + IoWriteFuture writeFuture = s.writePacket(buf); + writeFuture.addListener(new SshFutureListener<IoWriteFuture>() { @Override public void operationComplete(IoWriteFuture f) { if (f.isWritten()) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/868ad00e/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java index 39036b8..7628ec9 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java @@ -859,7 +859,7 @@ public final class GenericUtils { * @return The wrapping instance */ public static <T> Iterable<T> multiIterableSuppliers(Iterable<? extends Supplier<? extends Iterable<? extends T>>> providers) { - return () -> stream(providers).flatMap(s -> stream(s.get())).map(u -> (T) u).iterator(); + return () -> stream(providers).<T>flatMap(s -> stream(s.get())).map(Function.identity()).iterator(); } public static <K, V> MapBuilder<K, V> mapBuilder() {
