This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit adff42b650ac9bc0d2da4c3a4dec5c8099197042 Author: w <none> AuthorDate: Mon Oct 7 22:23:49 2019 -0700 ChannelSession: Consistently use RequestHandler.Result # Conflicts: # sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java --- .../src/main/java/org/apache/sshd/server/channel/ChannelSession.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java b/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java index bcc3e6d..3303584 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java @@ -45,7 +45,6 @@ import org.apache.sshd.common.channel.ChannelOutputStream; import org.apache.sshd.common.channel.ChannelRequestHandler; import org.apache.sshd.common.channel.PtyMode; import org.apache.sshd.common.channel.RequestHandler; -import org.apache.sshd.common.channel.RequestHandler.Result; import org.apache.sshd.common.channel.Window; import org.apache.sshd.common.file.FileSystemAware; import org.apache.sshd.common.file.FileSystemFactory; @@ -386,7 +385,7 @@ public class ChannelSession extends AbstractServerChannel { @Override protected IoWriteFuture sendResponse( - Buffer buffer, String req, Result result, boolean wantReply) + Buffer buffer, String req, RequestHandler.Result result, boolean wantReply) throws IOException { IoWriteFuture future = super.sendResponse(buffer, req, result, wantReply); if (!RequestHandler.Result.ReplySuccess.equals(result)) {