Fix merge conflict in last cherrypicked commit

wravery · wravery · commit c093a2da411f · 2019-02-05T21:13:13.000-08:00
diff --git a/GraphQLService.cpp b/GraphQLService.cpp
@@ -1644,7 +1644,7 @@ SubscriptionKey Request::subscribe(SubscriptionParams && params, SubscriptionCal
 		});
 
 	auto fragments = fragmentVisitor.getFragments();
-	auto operationDefinition = findOperationDefinition(*params.query.root, params.operationName);
+	auto operationDefinition = findOperationDefinition(*params.query->root, params.operationName);
 
 	if (!operationDefinition.second)
 	{

Original file line number	Diff line number	Diff line change
`@@ -1644,7 +1644,7 @@ SubscriptionKey Request::subscribe(SubscriptionParams && params, SubscriptionCal`
`1644`	`1644`	`});`
`1645`	`1645`
`1646`	`1646`	`auto fragments = fragmentVisitor.getFragments();`
`1647`		`- auto operationDefinition = findOperationDefinition(*params.query.root, params.operationName);`
	`1647`	`+ auto operationDefinition = findOperationDefinition(*params.query->root, params.operationName);`
`1648`	`1648`
`1649`	`1649`	`if (!operationDefinition.second)`
`1650`	`1650`	`{`