Merge pull request #346 from peschwa/jvminterop

Check if we actually got a return value from the Java method.
rakudo · Jan 5, 2015 · eed5d33 · eed5d33
2 parents 0769d41 + 1b769df
commit eed5d33
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/vm/jvm/runtime/org/perl6/rakudo/RakudoJavaInterop.java b/src/vm/jvm/runtime/org/perl6/rakudo/RakudoJavaInterop.java
@@ -259,8 +259,12 @@ public RakudoJavaInterop(GlobalContext gc) {
     }
 
     public static Object filterReturnValueMethod(Object in, ThreadContext tc) {
-        Class<?> what = in.getClass();
         GlobalExt gcx = RakOps.key.getGC(tc);
+        if(in == null) {
+            return gcx.Nil;
+        }
+
+        Class<?> what = in.getClass();
         Object out = null;
         if(what == void.class) {
             out = null;