Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TypeUtils wildcard fixes 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1594387 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Matthew Jason Benson 2014-05-13 21:13:04 +00:00
parent 6f688e40ba
commit 68a6fd6125
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
View File

@ -1623,8 +1623,8 @@ private static boolean equals(GenericArrayType a, Type t) {
private static boolean equals(WildcardType w, Type t) {
if (t instanceof WildcardType) {
final WildcardType other = (WildcardType) t;
return equals(w.getLowerBounds(), other.getLowerBounds())
&& equals(TypeUtils.getImplicitUpperBounds(w), TypeUtils.getImplicitUpperBounds(other));
return equals(getImplicitLowerBounds(w), getImplicitLowerBounds(other))
&& equals(getImplicitUpperBounds(w), getImplicitUpperBounds(other));
}
return true;
}
@ -1808,9 +1808,9 @@ private static String wildcardTypeToString(WildcardType w) {
final StringBuilder buf = new StringBuilder().append('?');
final Type[] lowerBounds = w.getLowerBounds();
final Type[] upperBounds = w.getUpperBounds();
if (lowerBounds.length > 0) {
if (lowerBounds.length > 1 || lowerBounds.length == 1 && lowerBounds[0] != null) {
appendAllTo(buf.append(" super "), " & ", lowerBounds);
} else if (!(upperBounds.length == 1 && Object.class.equals(upperBounds[0]))) {
} else if (upperBounds.length > 1 || upperBounds.length == 1 && !Object.class.equals(upperBounds[0])) {
appendAllTo(buf.append(" extends "), " & ", upperBounds);
}
return buf.toString();