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/12/15 08:15:41 UTC

[1/2] karaf git commit: [KARAF-4184] ArgumentCompleter has incorrect check for enum type

Repository: karaf
Updated Branches:
  refs/heads/master a443f520a -> de2a50cd0


[KARAF-4184] ArgumentCompleter has incorrect check for enum type


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bba70a3e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bba70a3e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bba70a3e

Branch: refs/heads/master
Commit: bba70a3e63211749e78a6c14940af6c58bc951ec
Parents: bf00362
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sun Dec 13 14:50:14 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Dec 13 14:50:14 2015 +0100

----------------------------------------------------------------------
 .../apache/karaf/shell/impl/action/command/ArgumentCompleter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/bba70a3e/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ArgumentCompleter.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ArgumentCompleter.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ArgumentCompleter.java
index d87d0f9..adc554b 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ArgumentCompleter.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ArgumentCompleter.java
@@ -177,7 +177,7 @@ public class ArgumentCompleter implements Completer {
             completer = new FileCompleter();
         } else if (type.isAssignableFrom(Boolean.class) || type.isAssignableFrom(boolean.class)) {
             completer = new StringsCompleter(new String[] {"false", "true"}, false);
-        } else if (type.isAssignableFrom(Enum.class)) {
+        } else if (Enum.class.isAssignableFrom(type)) {
             Set<String> values = new HashSet<>();
             for (Object o : EnumSet.allOf((Class<Enum>) type)) {
                 values.add(o.toString());


[2/2] karaf git commit: Merge branch 'KARAF-4184' of https://github.com/oscerd/karaf

Posted by jb...@apache.org.
Merge branch 'KARAF-4184' of https://github.com/oscerd/karaf


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/de2a50cd
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/de2a50cd
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/de2a50cd

Branch: refs/heads/master
Commit: de2a50cd062e1836f64a235fd1de61557e514020
Parents: a443f52 bba70a3
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Dec 14 21:11:02 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Dec 14 21:11:02 2015 +0100

----------------------------------------------------------------------
 .../apache/karaf/shell/impl/action/command/ArgumentCompleter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------