unfinished fix for 137568

diff --git a/weaver/src/org/aspectj/weaver/TypeFactory.java b/weaver/src/org/aspectj/weaver/TypeFactory.java
index d750d10eebe62910c846d60997a6be02b608a27b..93bf26f8ebd2a8e11d095d398992e126cc173722 100644 (file)
--- a/weaver/src/org/aspectj/weaver/TypeFactory.java
+++ b/weaver/src/org/aspectj/weaver/TypeFactory.java
@@ -104,6 +104,21 @@ public class TypeFactory {
                        return ret;
                } else if(firstChar=='+') { 
                        // ? extends ...
+       /*
+                       // this bound calc is for bug pr137568 ... don't like duplicating this here from above...
+                       String subsig = signature.substring(1);
+                       int startOfParams = subsig.indexOf('<');
+                       int endOfParams = subsig.lastIndexOf('>');
+                       UnresolvedType bound = null;
+                       if (startOfParams==-1) {
+                               bound = new UnresolvedType(subsig);
+                       } else {
+                               String signatureErasure = "L" + subsig.substring(1,startOfParams) + ";";
+                               UnresolvedType[] typeParams = createTypeParams(subsig.substring(startOfParams +1, endOfParams));
+                               bound = new UnresolvedType(subsig,signatureErasure,typeParams);
+                       }
+       */
+                       //all that replaces: 
                        UnresolvedType bound = UnresolvedType.forSignature(signature.substring(1));
                        UnresolvedType ret = new UnresolvedType(signature);
                        ret.typeKind = TypeKind.WILDCARD;