[karaf] branch master updated: [KARAF-6542] Fix sshd server refresh issue

[jbonofre]

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

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 71a2165  [KARAF-6542] Fix sshd server refresh issue
     new 5432fda  Merge pull request #1007 from jbonofre/KARAF-6542
71a2165 is described below

commit 71a21656a10d440047941f75abafc7081c67ecbf
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Mon Dec 16 08:06:19 2019 +0100

    [KARAF-6542] Fix sshd server refresh issue
    
    Credit To: J. Brébec
---
 shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java 
b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
index 292322a..1b22357 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
@@ -120,10 +120,14 @@ public class Activator extends BaseActivator implements 
ManagedService {
         if (server == null) {
             return; // can result from bad specification.
         }
+        ClassLoader originalClassLoader = 
Thread.currentThread().getContextClassLoader();
         try {
+            
Thread.currentThread().setContextClassLoader(SshServer.class.getClassLoader());
             server.start();
-        } catch (IOException e) {
+        } catch (Exception e) {
             LOGGER.warn("Exception caught while starting SSH server", e);
+        } finally {
+            Thread.currentThread().setContextClassLoader(originalClassLoader);
         }
     }