# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1423674592 -3600
# Node ID 244f1b50be4ce4139bc57721b10b3cc3e7da71c3
# Parent  bf846a8136888a52f88ee4eed7967359f142cc08
Truffle-DSL: fixed fingbugs error

diff -r bf846a813688 -r 244f1b50be4c graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/DSLExpression.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/DSLExpression.java	Fri Jan 23 12:19:26 2015 +0100
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/DSLExpression.java	Wed Feb 11 18:09:52 2015 +0100
@@ -233,10 +233,13 @@
 
         @Override
         public TypeMirror getResolvedType() {
+            if (resolvedMethod == null) {
+                return null;
+            }
             if (resolvedMethod.getKind() == ElementKind.CONSTRUCTOR) {
                 return resolvedMethod.getEnclosingElement().asType();
             } else {
-                return resolvedMethod != null ? resolvedMethod.getReturnType() : null;
+                return resolvedMethod.getReturnType();
             }
         }