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 "bug 344 interpretation of slashes ('/') in URI"
[controller.git]
/
opendaylight
/
netconf
/
netconf-util
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
util
/
handler
/
ssh
/
client
/
SshSession.java
diff --git
a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshSession.java
b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshSession.java
index df400aa1413e64108dab66190dd763b4778dc0ce..411036c975baf2f29b9f98e4c69b8956acf64474 100644
(file)
--- a/
opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshSession.java
+++ b/
opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/ssh/client/SshSession.java
@@
-11,6
+11,7
@@
package org.opendaylight.controller.netconf.util.handler.ssh.client;
import ch.ethz.ssh2.Session;
import ch.ethz.ssh2.StreamGobbler;
import ch.ethz.ssh2.Session;
import ch.ethz.ssh2.StreamGobbler;
+import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@
-18,8
+19,8
@@
import java.io.OutputStream;
/**
* Wrapper class for proprietary SSH sessions implementations
*/
/**
* Wrapper class for proprietary SSH sessions implementations
*/
-public class SshSession {
- final Session session;
+public class SshSession
implements Closeable
{
+
private
final Session session;
public SshSession(Session session) {
this.session = session;
public SshSession(Session session) {
this.session = session;
@@
-61,8
+62,8
@@
public class SshSession {
return session.waitUntilDataAvailable(timeout);
}
return session.waitUntilDataAvailable(timeout);
}
- public int waitForCondition(int condition
_s
et, long timeout) {
- return session.waitForCondition(condition
_s
et, timeout);
+ public int waitForCondition(int condition
S
et, long timeout) {
+ return session.waitForCondition(condition
S
et, timeout);
}
public Integer getExitStatus() {
}
public Integer getExitStatus() {
@@
-72,4
+73,9
@@
public class SshSession {
public String getExitSignal() {
return session.getExitSignal();
}
public String getExitSignal() {
return session.getExitSignal();
}
+
+ @Override
+ public void close() {
+ session.close();
+ }
}
}