Merge pull request #198 from jmccaull/master

Per request context setting bug fixes

Author: oliemansm

src/main/java/graphql/servlet/instrumentation/ConfigurableDispatchInstrumentation.java

@@ -162,19 +162,20 @@ public InstrumentationContext<Object> beginFieldFetch(InstrumentationFieldFetchP
 
     @Override
     public CompletableFuture<ExecutionResult> instrumentExecutionResult(ExecutionResult executionResult, InstrumentationExecutionParameters parameters) {
-        if (!options.isIncludeStatistics()) {
-            return CompletableFuture.completedFuture(executionResult);
-        }
         DataLoaderDispatcherInstrumentationState state = parameters.getInstrumentationState();
-        Map<Object, Object> currentExt = executionResult.getExtensions();
-        Map<Object, Object> statsMap = new LinkedHashMap<>(currentExt == null ? Collections.emptyMap() : currentExt);
-        Map<Object, Object> dataLoaderStats = buildStatsMap(state);
-        statsMap.put("dataloader", dataLoaderStats);
         state.getApproach().removeTracking(parameters.getExecutionInput().getExecutionId());
+        if (!options.isIncludeStatistics()) {
+            return CompletableFuture.completedFuture(executionResult);
+        } else {
+            Map<Object, Object> currentExt = executionResult.getExtensions();
+            Map<Object, Object> statsMap = new LinkedHashMap<>(currentExt == null ? Collections.emptyMap() : currentExt);
+            Map<Object, Object> dataLoaderStats = buildStatsMap(state);
+            statsMap.put("dataloader", dataLoaderStats);
 
-        log.debug("Data loader stats : {}", dataLoaderStats);
+            log.debug("Data loader stats : {}", dataLoaderStats);
 
-        return CompletableFuture.completedFuture(new ExecutionResultImpl(executionResult.getData(), executionResult.getErrors(), statsMap));
+            return CompletableFuture.completedFuture(new ExecutionResultImpl(executionResult.getData(), executionResult.getErrors(), statsMap));
+        }
     }
 
     private Map<Object, Object> buildStatsMap(DataLoaderDispatcherInstrumentationState state) {

src/main/java/graphql/servlet/instrumentation/RequestStack.java

@@ -117,7 +117,9 @@ public void setStatus(ExecutionId executionId, boolean toState) {
             throw new IllegalStateException(
                 String.format("Can not set status for execution %s, it is not managed by this request stack", executionId));
         }
-        status.put(executionId, toState);
+        if (toState) {
+            status.put(executionId, true);
+        }
     }
 
     /**