# HG changeset patch
# User Michael Van De Vanter  <michael.van.de.vanter@oracle.com>
# Date 1447900938 28800
# Node ID ff5c0b5677cdafea4c5cf80d133c3fbe6d3ef05f
# Parent  73cf3aefeffecf75195491dbc95efd264f06bab9
Truffle/Instrumentation:  make the language object visualizer more robust when given null.

diff -r 73cf3aefeffe -r ff5c0b5677cd truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultVisualizer.java
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultVisualizer.java	Tue Nov 17 19:43:25 2015 -0800
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultVisualizer.java	Wed Nov 18 18:42:18 2015 -0800
@@ -76,6 +76,9 @@
     }
 
     public String displayValue(Object value, int trim) {
+        if (value == null) {
+            return "<empty>";
+        }
         return trim(value.toString(), trim);
     }
 
diff -r 73cf3aefeffe -r ff5c0b5677cd truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLDefaultVisualizer.java
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLDefaultVisualizer.java	Tue Nov 17 19:43:25 2015 -0800
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLDefaultVisualizer.java	Wed Nov 18 18:42:18 2015 -0800
@@ -94,7 +94,10 @@
 
     @Override
     public String displayValue(Object value, int trim) {
-        if (value == null || value == SLNull.SINGLETON) {
+        if (value == null) {
+            return "<empty>";
+        }
+        if (value == SLNull.SINGLETON) {
             return "null";
         }
         return trim(value.toString(), trim);