Testing for all 3 new method implementations.

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

diff --git a/src/main/gov/nasa/jpf/vm/MethodInfo.java b/src/main/gov/nasa/jpf/vm/MethodInfo.java
index ce7828183e7e0873baa648bf06cc0eed0b090678..4c904b732caaec2cf089e69f67de487acc309c03 100644 (file)
--- a/src/main/gov/nasa/jpf/vm/MethodInfo.java
+++ b/src/main/gov/nasa/jpf/vm/MethodInfo.java
@@ -506,7 +506,7 @@ public class MethodInfo extends InfoObject implements GenericSignatureHolder  {
   // TODO: Fix for Groovy's model-checking
   public String[] getArgumentGenericTypeNames () {
     // To accommodate methods that do not have generic types
-    if (genericSignature == null)
+    if (genericSignature == null || genericSignature.equals(""))
       return getArgumentTypeNames();
     return Types.getArgumentTypeNames(genericSignature);
   }
@@ -589,6 +589,8 @@ public class MethodInfo extends InfoObject implements GenericSignatureHolder  {
   }
 
   public String getGenericReturnTypeName () {
+    if (genericSignature == null || genericSignature.equals(""))
+      return Types.getReturnTypeName(signature);
     return Types.getGenericReturnTypeName(genericSignature);
   }