no 1.5 API!

1 files changed, 10 insertions, 1 deletions

diff --git a/weaver/src/org/aspectj/weaver/TypeFactory.java b/weaver/src/org/aspectj/weaver/TypeFactory.java
index 22d8633f0..3168f9ca3 100644
--- a/weaver/src/org/aspectj/weaver/TypeFactory.java
+++ b/weaver/src/org/aspectj/weaver/TypeFactory.java
@@ -114,7 +114,7 @@ public class TypeFactory {
 				StringBuffer erasureSig = new StringBuffer(signature);
 				while (startOfParams!=-1) {
 					erasureSig.delete(startOfParams,endOfParams+1);
-					startOfParams = erasureSig.indexOf("<");
+					startOfParams = locateFirstBracket(erasureSig);
 					if (startOfParams!=-1) endOfParams = locateMatchingEndBracket(erasureSig,startOfParams);
 				}
 				
@@ -208,6 +208,15 @@ public class TypeFactory {
 		}
 		return idx;
 	}
+	
+	private static int locateFirstBracket(StringBuffer signature) {
+		int idx = 0;
+		while (idx<signature.length()) {
+			if (signature.charAt(idx)=='<') return idx;
+			idx++;
+		}
+		return -1;
+	}
 
 	private static UnresolvedType[] createTypeParams(String typeParameterSpecification) {
 		String remainingToProcess = typeParameterSpecification;