Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes I85b49247,Icca28a4a
[controller.git]
/
opendaylight
/
netconf
/
netconf-ssh
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
ssh
/
threads
/
SocketThread.java
diff --git
a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/threads/SocketThread.java
b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/threads/SocketThread.java
index e5da03b4cf4c9d97765ce098a8c2761b0eda8e39..6df19155110e098ea093b370f2473e8ed9135704 100644
(file)
--- a/
opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/threads/SocketThread.java
+++ b/
opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/threads/SocketThread.java
@@
-59,8
+59,8
@@
public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser
conn = new ServerConnection(socket);
try {
conn.setPEMHostKey(authProvider.getPEMAsCharArray(),"netconf");
conn = new ServerConnection(socket);
try {
conn.setPEMHostKey(authProvider.getPEMAsCharArray(),"netconf");
- } catch (
IO
Exception e) {
-
e.printStackTrace(
);
+ } catch (Exception e) {
+
logger.debug("Server authentication setup failed."
);
}
conn.setAuthenticationCallback(this);
conn.setServerConnectionCallback(this);
}
conn.setAuthenticationCallback(this);
conn.setServerConnectionCallback(this);
@@
-108,6
+108,7
@@
public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser
netconf_ssh_input.join();
}
} catch (InterruptedException e) {
netconf_ssh_input.join();
}
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
logger.error("netconf_ssh_input join error ",e);
}
logger.error("netconf_ssh_input join error ",e);
}
@@
-116,6
+117,7
@@
public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser
netconf_ssh_output.join();
}
} catch (InterruptedException e) {
netconf_ssh_output.join();
}
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
logger.error("netconf_ssh_output join error ",e);
}
logger.error("netconf_ssh_output join error ",e);
}