Updated Branches: refs/heads/1.6.x 76e5e80e5 -> 859eaca9f
Do not eagerly check for existence in FilePayload This is a TOCTOU violation and FilePayload.getInput already propagates this. This commit allows external callers like jclouds-cli to introspect on the exception type, returning a more friendly error message in some situations. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/859eaca9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/859eaca9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/859eaca9 Branch: refs/heads/1.6.x Commit: 859eaca9fd59613c0f66f9055079d46a577b42b6 Parents: 76e5e80 Author: Andrew Gaul <[email protected]> Authored: Mon Jul 15 23:26:42 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Jul 15 23:34:33 2013 -0700 ---------------------------------------------------------------------- core/src/main/java/org/jclouds/io/payloads/FilePayload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/859eaca9/core/src/main/java/org/jclouds/io/payloads/FilePayload.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/io/payloads/FilePayload.java b/core/src/main/java/org/jclouds/io/payloads/FilePayload.java index 330c0c0..b60616a 100644 --- a/core/src/main/java/org/jclouds/io/payloads/FilePayload.java +++ b/core/src/main/java/org/jclouds/io/payloads/FilePayload.java @@ -34,7 +34,7 @@ public class FilePayload extends BasePayload<File> { public FilePayload(File content) { super(content); getContentMetadata().setContentLength(content.length()); - checkArgument(checkNotNull(content, "content").exists(), "file must exist: " + content); + checkNotNull(content, "content"); } /**
