Fixing getGenericReturnType to recognize the GenericArrayTypeImpl and ParameterizedTy...

[jpf-core.git] / src / main / gov / nasa / jpf / vm / Types.java

diff --git a/src/main/gov/nasa/jpf/vm/Types.java b/src/main/gov/nasa/jpf/vm/Types.java
index 64aec5c886a94f994534b3f94812e3246e1bf165..f9723a6689c36f5c95e27d7c6f5b2ab9586bef8b 100644 (file)
--- a/src/main/gov/nasa/jpf/vm/Types.java
+++ b/src/main/gov/nasa/jpf/vm/Types.java
@@ -1222,7 +1222,7 @@ public class Types {
       String typeVarName = "";
       int comma = signature.indexOf(',', pos);
       if (comma == -1) {
-        int closing = signature.indexOf('>', pos);
+        int closing = signature.lastIndexOf('>', signature.length());
         typeVarName = signature.substring(pos + 1, closing);
         pos = signature.length();
       } else {
@@ -1269,6 +1269,10 @@ public class Types {
     return (opening != -1);
   }
 
+  public static boolean isParameterizedType(String signature) {
+    return Types.isGenericSignature(signature);
+  }
+
   public static boolean isArraySignature(String signature) {
     if (signature == null || signature.equals(""))
       return false;