Updated Branches: refs/heads/1.6.x c8b2caf57 -> ee81c1e59
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/ee81c1e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/tree/ee81c1e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/diff/ee81c1e5 Branch: refs/heads/1.6.x Commit: ee81c1e59bdab76fe5b7f80b25726044ce624919 Parents: c8b2caf Author: Andrew Gaul <[email protected]> Authored: Mon May 20 14:55:12 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Thu May 23 14:10:13 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/ee81c1e5/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);
