Follow up to #328

graphql · Mar 24, 2016 · 1983079 · 1983079
1 parent 8ba02b2
commit 1983079
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/execution/execute.js b/src/execution/execute.js
@@ -798,11 +798,12 @@ function completeAbstractValue(
   info: GraphQLResolveInfo,
   result: mixed
 ): mixed {
-  let runtimeType: ?GraphQLObjectType;
-  if (returnType.resolveType) {
-    runtimeType = returnType.resolveType(result, info);
-  } else {
-    runtimeType = defaultResolveTypeFn(result, info, returnType);
+  const runtimeType = returnType.resolveType ?
+    returnType.resolver(result, info) :
+    defaultResolveTypeFn(result, info, returnType);
+
+  if (!runtimeType) {
+    return null;
   }
 
   if (runtimeType && !returnType.isPossibleType(runtimeType)) {
@@ -813,10 +814,6 @@ function completeAbstractValue(
     );
   }
 
-  if (!runtimeType) {
-    return null;
-  }
-
   return completeObjectValue(
     exeContext,
     runtimeType,