Fixes #4641. NPE when printing a variable in a view.

jruby · Jun 13, 2017 · 87e1a49 · 87e1a49
1 parent 20d3053
commit 87e1a49
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/runtime/marshal/UnmarshalStream.java b/core/src/main/java/org/jruby/runtime/marshal/UnmarshalStream.java
@@ -79,7 +79,9 @@ public class UnmarshalStream extends InputStream {
     public UnmarshalStream(Ruby runtime, InputStream in, IRubyObject proc, boolean taint) throws IOException {
         assert runtime != null;
         assert in != null;
-        assert proc != null;
+
+        // Older native java ext expects proc can be null (spymemcached.jruby at least).
+        if (proc == null) proc = runtime.getNil();
 
         this.runtime = runtime;
         this.cache = new UnmarshalCache(runtime);