# HG changeset patch # User Christian Humer # Date 1407945978 -7200 # Node ID 7eeae4545685fef70ebc5f6d5ec985ee16e65ef1 # Parent 16f933f2fd59de044ed405a002ee976fed445d02 Truffle-DSL: fixed ElementUtils#getType should not throw NPE if type is not on the classpath. diff -r 16f933f2fd59 -r 7eeae4545685 graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/ElementUtils.java --- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/ElementUtils.java Wed Aug 13 14:06:36 2014 +0200 +++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/ElementUtils.java Wed Aug 13 18:06:18 2014 +0200 @@ -41,7 +41,6 @@ public class ElementUtils { public static TypeMirror getType(ProcessingEnvironment processingEnv, Class element) { - TypeMirror mirror; if (element.isPrimitive()) { if (element == void.class) { return processingEnv.getTypeUtils().getNoType(TypeKind.VOID); @@ -67,11 +66,14 @@ assert false; return null; } - mirror = processingEnv.getTypeUtils().getPrimitiveType(typeKind); + return processingEnv.getTypeUtils().getPrimitiveType(typeKind); } else { - mirror = processingEnv.getElementUtils().getTypeElement(element.getCanonicalName()).asType(); + TypeElement typeElement = processingEnv.getElementUtils().getTypeElement(element.getCanonicalName()); + if (typeElement == null) { + return null; + } + return typeElement.asType(); } - return mirror; } public static ExecutableElement findExecutableElement(DeclaredType type, String name) {