Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Do not catch Throwables, but rather Exceptions
[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 204bf1d13194800e8a9347e97e97c2959ce9417f..e07c7ed6ac901156aa2d6c23a75114bd523584da 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
@@
-109,8
+109,8
@@
public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser
netconf_ssh_output.setDaemon(false);
netconf_ssh_output.start();
netconf_ssh_output.setDaemon(false);
netconf_ssh_output.start();
- } catch (
Throwable t)
{
- logger.error("SSH bridge could
n't create echo socket",t.getMessage(),
t);
+ } catch (
Exception t)
{
+ logger.error("SSH bridge could
not create echo socket: {}", t.getMessage(),
t);
try {
if (netconf_ssh_input!=null){
try {
if (netconf_ssh_input!=null){
@@
-129,7
+129,6
@@
public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser
Thread.currentThread().interrupt();
logger.error("netconf_ssh_output join error ",e);
}
Thread.currentThread().interrupt();
logger.error("netconf_ssh_output join error ",e);
}
-
}
} else {
try {
}
} else {
try {