[mina-sshd] branch master updated: TCP/IP forwarding: always resume reading, even in error cases

[twolf]

This is an automated email from the ASF dual-hosted git repository.

twolf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git


The following commit(s) were added to refs/heads/master by this push:
     new 99de217bc TCP/IP forwarding: always resume reading, even in error cases
99de217bc is described below

commit 99de217bc22d30075b60678ace6b7551c9fa136f
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Fri Jun 10 09:30:17 2022 +0200

    TCP/IP forwarding: always resume reading, even in error cases
    
    Follow-up on commit 3c2e8b6f: missed a case in the DefaultForwarder.
---
 .../java/org/apache/sshd/common/forward/DefaultForwarder.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git 
a/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarder.java 
b/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarder.java
index 96560971c..264634884 100644
--- 
a/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarder.java
+++ 
b/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwarder.java
@@ -1128,6 +1128,7 @@ public class DefaultForwarder
             }
             session.suspendRead();
             ThreadUtils.runAsInternal(() -> 
channel.getAsyncIn().writeBuffer(buffer).addListener(f -> {
+                session.resumeRead();
                 Throwable e = f.getException();
                 if (e != null) {
                     try {
@@ -1137,11 +1138,8 @@ public class DefaultForwarder
                                 err.getClass().getSimpleName(), 
e.getClass().getSimpleName(), e.getMessage(), channel,
                                 err.getMessage(), err);
                     }
-                } else {
-                    if (log.isTraceEnabled()) {
-                        log.trace("messageReceived({}) channel={} message={} 
forwarded", session, channel, totalMessages);
-                    }
-                    session.resumeRead();
+                } else if (log.isTraceEnabled()) {
+                    log.trace("messageReceived({}) channel={} message={} 
forwarded", session, channel, totalMessages);
                 }
             }));
         }