fix merge errors

andimarek · andimarek · commit 5771abbc3f23 · 2018-03-23T14:10:07.000+11:00
diff --git a/src/main/java/graphql/execution/defer/DeferredErrorSupport.java b/src/main/java/graphql/execution/defer/DeferredErrorSupport.java
@@ -17,7 +17,7 @@ public class DeferredErrorSupport {
     private final List<GraphQLError> errors = new CopyOnWriteArrayList<>();
 
     public void onFetchingException(ExecutionStrategyParameters parameters, Throwable e) {
-        ExceptionWhileDataFetching error = new ExceptionWhileDataFetching(parameters.path(), e, parameters.field().get(0).getSourceLocation());
+        ExceptionWhileDataFetching error = new ExceptionWhileDataFetching(parameters.getPath(), e, parameters.getField().get(0).getSourceLocation());
         onError(error);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class DeferredErrorSupport {`
`17`	`17`	`private final List<GraphQLError> errors = new CopyOnWriteArrayList<>();`
`18`	`18`
`19`	`19`	`public void onFetchingException(ExecutionStrategyParameters parameters, Throwable e) {`
`20`		`- ExceptionWhileDataFetching error = new ExceptionWhileDataFetching(parameters.path(), e, parameters.field().get(0).getSourceLocation());`
	`20`	`+ ExceptionWhileDataFetching error = new ExceptionWhileDataFetching(parameters.getPath(), e, parameters.getField().get(0).getSourceLocation());`
`21`	`21`	`onError(error);`
`22`	`22`	`}`
`23`	`23`