Mercurial > hg > truffle

changeset 21358:19801a65cf57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle/Instrumentation: NPE guard
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Tue, 12 May 2015 18:26:52 -0700
parents acfc5e32e678
children c4b87ad2c4c8
files graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrument.java
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrument.java	Tue May 12 18:04:53 2015 -0700
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrument.java	Tue May 12 18:26:52 2015 -0700
@@ -466,7 +466,10 @@
                 if (requiredResultType == null) {
                     return;
                 }
-                if (result == null || !(requiredResultType.isAssignableFrom(result.getClass()))) {
+                if (result == null) {
+                    throw new RuntimeException("Instrument result null: " + requiredResultType.getSimpleName() + " is required");
+                }
+                if (!(requiredResultType.isAssignableFrom(result.getClass()))) {
                     throw new RuntimeException("Instrument result " + result.toString() + " not assignable to " + requiredResultType.getSimpleName());
                 }
             }