You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/01/17 19:28:53 UTC
karaf-cellar git commit: Prevent NPE in cluster:bundle-block command
Repository: karaf-cellar
Updated Branches:
refs/heads/master b5a686c1b -> c738c846a
Prevent NPE in cluster:bundle-block command
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/c738c846
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/c738c846
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/c738c846
Branch: refs/heads/master
Commit: c738c846ab529e40aba73d63ceefb54be47454f8
Parents: b5a686c
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Jan 17 19:28:35 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Jan 17 19:28:35 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/karaf/cellar/bundle/shell/BlockCommand.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/c738c846/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BlockCommand.java
----------------------------------------------------------------------
diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BlockCommand.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BlockCommand.java
index 8096716..098d38a 100644
--- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BlockCommand.java
+++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BlockCommand.java
@@ -54,7 +54,7 @@ public class BlockCommand extends BundleCommandSupport {
patterns.add(bundles.get(selectedBundle).getLocation());
}
- if (patterns.isEmpty()) {
+ if (patterns.isEmpty() && ids != null) {
for (String id : ids) {
patterns.add(id);
}