[Truffle] Exception's message can be null if initialize is not run.

* Exception.allocate.message for instance.
jruby · Aug 28, 2015 · 554f1c0 · 554f1c0
1 parent b973d91
commit 554f1c0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java
@@ -13,6 +13,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.SourceSection;
+
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.RubyString;
 import org.jruby.truffle.nodes.RubyGuards;
@@ -137,7 +138,8 @@ public MessageNode(RubyContext context, SourceSection sourceSection) {
 
         @Specialization
         public Object message(DynamicObject exception) {
-            return Layouts.EXCEPTION.getMessage(exception);
+            final Object message = Layouts.EXCEPTION.getMessage(exception);
+            return message == null ? nil() : message;
         }
 
     }