(tomee) branch main updated: Fix upgrade issue from SSHD

[rz...@apache.org]

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

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/main by this push:
     new e8c1fd3650 Fix upgrade issue from SSHD
e8c1fd3650 is described below

commit e8c1fd36504febf92c7f5e180db397fc3233586d
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Tue Apr 30 11:31:34 2024 +0200

    Fix upgrade issue from SSHD
---
 .../apache/openejb/server/ssh/OpenEJBCommands.java   | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java b/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java
index 6c81d0fbde..3a55d446b9 100644
--- a/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java
+++ b/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java
@@ -19,9 +19,10 @@ package org.apache.openejb.server.ssh;
 import org.apache.openejb.server.cli.CliRunnable;
 import org.apache.sshd.server.Environment;
 import org.apache.sshd.server.ExitCallback;
-import org.apache.sshd.server.SessionAware;
+import org.apache.sshd.server.channel.ChannelSession;
 import org.apache.sshd.server.command.Command;
 import org.apache.sshd.server.session.ServerSession;
+import org.apache.sshd.server.session.ServerSessionAware;
 
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
@@ -31,7 +32,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.security.PrivilegedAction;
 
-public class OpenEJBCommands extends CliRunnable implements Command, Runnable, SessionAware {
+public class OpenEJBCommands extends CliRunnable implements Command, Runnable, ServerSessionAware {
     private ExitCallback cbk;
     private LoginContext loginContext;
 
@@ -64,11 +65,6 @@ public class OpenEJBCommands extends CliRunnable implements Command, Runnable, S
         cbk = callback;
     }
 
-    @Override
-    public void start(Environment env) throws IOException {
-        start();
-    }
-
     @Override
     public void run() {
         if (loginContext == null) {
@@ -102,5 +98,15 @@ public class OpenEJBCommands extends CliRunnable implements Command, Runnable, S
         setUsername(username);
         loginContext = session.getAttribute(OpenEJBJaasPasswordAuthenticator.LOGIN_CONTEXT_KEY);
     }
+
+    @Override
+    public void start(ChannelSession channelSession, Environment environment) throws IOException {
+        start();
+    }
+
+    @Override
+    public void destroy(ChannelSession channelSession) throws Exception {
+        destroy();
+    }
 }