Mercurial > hg > truffle

changeset 20825:854b0b6854f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Guard against NullPointerException
author Christian Wimmer <christian.wimmer@oracle.com>
date Wed, 08 Apr 2015 22:05:40 -0700
parents 7976223c77b5
children a4aa2116cfe0
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java	Wed Apr 08 22:01:36 2015 -0700
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java	Wed Apr 08 22:05:40 2015 -0700
@@ -160,7 +160,9 @@
     @Override
     public Map<Object, Object> getDebugProperties(Map<Object, Object> map) {
         Map<Object, Object> debugProperties = super.getDebugProperties(map);
-        debugProperties.put("targetMethod", callTarget.targetName());
+        if (callTarget != null) {
+            debugProperties.put("targetMethod", callTarget.targetName());
+        }
         return debugProperties;
     }