Mercurial > hg > truffle
diff graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrument.java @ 21358:19801a65cf57
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 | e34bc00733d1 |
children | b4aca5ec3f10 |
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()); } }