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/05/23 23:09:56 UTC
git commit: Avoid NPE in blobstore read without an argument
Updated Branches:
refs/heads/master d7bc6fecd -> 9dcae346e
Avoid NPE in blobstore read without an argument
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/commit/9dcae346
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/tree/9dcae346
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/diff/9dcae346
Branch: refs/heads/master
Commit: 9dcae346ed211bbf4a7b2b147e11e0b16800251a
Parents: d7bc6fe
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon May 20 14:55:12 2013 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Thu May 23 14:07:18 2013 -0700
----------------------------------------------------------------------
.../karaf/commands/blobstore/BlobReadCommand.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/9dcae346/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
index 4e43173..a4ac6ba 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.CommandException;
import org.apache.felix.gogo.commands.Option;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.KeyNotFoundException;
@@ -71,6 +72,9 @@ public class BlobReadCommand extends BlobStoreCommandWithOptions {
CharStreams.copy(CharStreams.newReaderSupplier(supplier, Charsets.UTF_8), System.err);
System.err.flush();
} else {
+ if (fileName == null) {
+ throw new CommandException("Must specify --exists, --display, or file name");
+ }
File file = new File(fileName);
if (!file.exists() && !file.createNewFile()) {
throw new IOException("Could not create: " + file);