You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2013/12/17 17:02:18 UTC
git commit: JCLOUDS-410. Correctly override getInput
Updated Branches:
refs/heads/master 16ea4fb33 -> 9d2e4759a
JCLOUDS-410. Correctly override getInput
Payload.getInput must always call openStream to handle overridden
methods correctly. Previously this caused errors in jclouds-chef in
BaseCipherPayload.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/9d2e4759
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/9d2e4759
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/9d2e4759
Branch: refs/heads/master
Commit: 9d2e4759a3be6af4856ad48aefe2a63bef65886f
Parents: 16ea4fb
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon Dec 16 20:28:24 2013 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Dec 17 08:02:03 2013 -0800
----------------------------------------------------------------------
.../main/java/org/jclouds/io/payloads/BaseCipherPayload.java | 4 ++--
.../main/java/org/jclouds/io/payloads/DelegatingPayload.java | 8 +++++++-
.../test/java/org/jclouds/io/payloads/MultipartFormTest.java | 4 ++--
3 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9d2e4759/core/src/main/java/org/jclouds/io/payloads/BaseCipherPayload.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/io/payloads/BaseCipherPayload.java b/core/src/main/java/org/jclouds/io/payloads/BaseCipherPayload.java
index b1bd930..67864cd 100644
--- a/core/src/main/java/org/jclouds/io/payloads/BaseCipherPayload.java
+++ b/core/src/main/java/org/jclouds/io/payloads/BaseCipherPayload.java
@@ -44,8 +44,8 @@ public abstract class BaseCipherPayload extends DelegatingPayload {
public abstract Cipher initializeCipher(Key key);
@Override
- public CipherInputStream openStream() {
- return new CipherInputStream(super.getInput(), initializeCipher(key));
+ public CipherInputStream openStream() throws IOException {
+ return new CipherInputStream(super.openStream(), initializeCipher(key));
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9d2e4759/core/src/main/java/org/jclouds/io/payloads/DelegatingPayload.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/io/payloads/DelegatingPayload.java b/core/src/main/java/org/jclouds/io/payloads/DelegatingPayload.java
index 4524411..00db330 100644
--- a/core/src/main/java/org/jclouds/io/payloads/DelegatingPayload.java
+++ b/core/src/main/java/org/jclouds/io/payloads/DelegatingPayload.java
@@ -22,6 +22,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import com.google.common.base.Throwables;
+
import org.jclouds.io.MutableContentMetadata;
import org.jclouds.io.Payload;
@@ -50,7 +52,11 @@ public class DelegatingPayload implements Payload {
*/
@Override
public InputStream getInput() {
- return delegate.getInput();
+ try {
+ return openStream();
+ } catch (IOException ioe) {
+ throw Throwables.propagate(ioe);
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9d2e4759/core/src/test/java/org/jclouds/io/payloads/MultipartFormTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/io/payloads/MultipartFormTest.java b/core/src/test/java/org/jclouds/io/payloads/MultipartFormTest.java
index 5a23418..9121c12 100644
--- a/core/src/test/java/org/jclouds/io/payloads/MultipartFormTest.java
+++ b/core/src/test/java/org/jclouds/io/payloads/MultipartFormTest.java
@@ -74,8 +74,8 @@ public class MultipartFormTest {
}
@Override
- public InputStream getInput() {
- return realPayload.getInput();
+ public InputStream openStream() throws IOException {
+ return realPayload.openStream();
}
@Override