You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2016/09/05 03:21:07 UTC
[2/2] karaf git commit: [KARAF-4693]revise the patch a bit
[KARAF-4693]revise the patch a bit
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7fa2902e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7fa2902e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7fa2902e
Branch: refs/heads/master
Commit: 7fa2902e212582ffe12a8546850f618ea5ef15de
Parents: ea01499
Author: Freeman Fang <fr...@gmail.com>
Authored: Mon Sep 5 11:20:47 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Mon Sep 5 11:20:47 2016 +0800
----------------------------------------------------------------------
.../org/apache/karaf/shell/support/converter/GenericType.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/7fa2902e/shell/core/src/main/java/org/apache/karaf/shell/support/converter/GenericType.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/converter/GenericType.java b/shell/core/src/main/java/org/apache/karaf/shell/support/converter/GenericType.java
index 736a018..ac97de2 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/support/converter/GenericType.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/support/converter/GenericType.java
@@ -158,7 +158,10 @@ public class GenericType extends ReifiedType {
if ( type instanceof GenericArrayType ) {
return new GenericType[] { new GenericType(((GenericArrayType) type).getGenericComponentType()) };
}
- return EMPTY;
+ if (type instanceof WildcardType) {
+ return EMPTY;
+ }
+ throw new IllegalStateException();
}
static Class<?> getConcreteClass(Type type) {