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 "Fix unstable FixedThreadPoolConfigBeanTest"
[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 ce26910b97dd449b10d395933e57cd6deccd52ea..04639cb36fb665753bda35908321508688e75103 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
@@
-66,7
+66,7
@@
public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser
try {
conn.setPEMHostKey(authProvider.getPEMAsCharArray(), "netconf");
} catch (Exception e) {
try {
conn.setPEMHostKey(authProvider.getPEMAsCharArray(), "netconf");
} catch (Exception e) {
- logger.
debug("Server authentication setup failed."
);
+ logger.
warn("Server authentication setup failed.", e
);
}
conn.setAuthenticationCallback(this);
conn.setServerConnectionCallback(this);
}
conn.setAuthenticationCallback(this);
conn.setServerConnectionCallback(this);
@@
-112,18
+112,18
@@
public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser
if (netconf_ssh_input != null) {
netconf_ssh_input.join();
}
if (netconf_ssh_input != null) {
netconf_ssh_input.join();
}
- } catch (InterruptedException e) {
+ } catch (InterruptedException e
1
) {
Thread.currentThread().interrupt();
Thread.currentThread().interrupt();
- logger.error("netconf_ssh_input join error ", e);
+ logger.error("netconf_ssh_input join error ", e
1
);
}
try {
if (netconf_ssh_output != null) {
netconf_ssh_output.join();
}
}
try {
if (netconf_ssh_output != null) {
netconf_ssh_output.join();
}
- } catch (InterruptedException e) {
+ } catch (InterruptedException e
2
) {
Thread.currentThread().interrupt();
Thread.currentThread().interrupt();
- logger.error("netconf_ssh_output join error ", e);
+ logger.error("netconf_ssh_output join error ", e
2
);
}
}
} else {
}
}
} else {