From 303fda645a5d23ba78534fb2c9f37561166e4908 Mon Sep 17 00:00:00 2001
From: Andrew Phillips <andrewp@apache.org>
Date: Mon, 3 Feb 2014 17:20:12 +0100
Subject: [PATCH] JCLOUDS-448: Upgrading sshj 0.8.1 -> 0.9.0

Also need to exclude the Bouncycastle dep from sshj. See JCLOUDS-440
---
 drivers/sshj/pom.xml                                           | 9 ++++++++-
 drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/sshj/pom.xml b/drivers/sshj/pom.xml
index ce85b06..d377c59 100644
--- a/drivers/sshj/pom.xml
+++ b/drivers/sshj/pom.xml
@@ -89,7 +89,14 @@
     <dependency>
       <groupId>net.schmizz</groupId>
       <artifactId>sshj</artifactId>
-      <version>0.8.1</version>
+      <version>0.9.0</version>
+      <exclusions>
+        <!-- provided by the jclouds-bouncycastle driver -->
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 
diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
index 4115517..dfe2add 100644
--- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
+++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
@@ -269,7 +269,7 @@ public void clear() throws IOException {
       public Payload create() throws Exception {
          sftp = acquire(sftpConnection);
          return Payloads.newInputStreamPayload(new CloseFtpChannelOnCloseInputStream(sftp.getSFTPEngine().open(path)
-                  .getInputStream(), sftp));
+                  .new RemoteFileInputStream(), sftp));
       }
 
       @Override
-- 
1.8.5.1