Fix #39, plus a lingering short-string-optimization bug

wravery · wravery · commit c53afe9389a6 · 2019-02-06T22:45:06.000-08:00
diff --git a/GraphQLService.cpp b/GraphQLService.cpp
@@ -1082,10 +1082,7 @@ std::future<response::Value> Object::resolve(const SelectionSetParams & selectio
 
 			response::Value result(response::Type::Map);
 
-			if (data.size() > 0)
-			{
-				result.emplace_back(strData, std::move(data));
-			}
+			result.emplace_back(strData, std::move(data));
 
 			if (errors.size() > 0)
 			{
diff --git a/include/graphqlservice/GraphQLService.h b/include/graphqlservice/GraphQLService.h
@@ -541,10 +541,7 @@ struct ModifiedResult
 
 				response::Value document(response::Type::Map);
 
-				if (data.size() > 0)
-				{
-					document.emplace_back(strData, std::move(data));
-				}
+				document.emplace_back(strData, std::move(data));
 
 				if (errors.size() > 0)
 				{

Original file line number	Diff line number	Diff line change
`@@ -1082,10 +1082,7 @@ std::future<response::Value> Object::resolve(const SelectionSetParams & selectio`
`1082`	`1082`
`1083`	`1083`	`response::Value result(response::Type::Map);`
`1084`	`1084`
`1085`		`- if (data.size() > 0)`
`1086`		`- {`
`1087`		`- result.emplace_back(strData, std::move(data));`
`1088`		`- }`
	`1085`	`+ result.emplace_back(strData, std::move(data));`
`1089`	`1086`
`1090`	`1087`	`if (errors.size() > 0)`
`1091`	`1088`	`{`
Original file line number	Diff line number	Diff line change
`@@ -541,10 +541,7 @@ struct ModifiedResult`
`541`	`541`
`542`	`542`	`response::Value document(response::Type::Map);`
`543`	`543`
`544`		`- if (data.size() > 0)`
`545`		`- {`
`546`		`- document.emplace_back(strData, std::move(data));`
`547`		`- }`
	`544`	`+ document.emplace_back(strData, std::move(data));`
`548`	`545`
`549`	`546`	`if (errors.size() > 0)`
`550`	`547`	`{`