From 40c7e290b2fc5cf3dcf39ca2a01a45b8b8326e3e Mon Sep 17 00:00:00 2001
From: vojtapol <vojta.polivka@gmail.com>
Date: Fri, 13 Sep 2019 10:47:07 -0400
Subject: [PATCH] Only use Optional.empty() if the parameter was present. Use
 null if the parameter is absent.

---
 .../kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt b/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt
index 7555f060..545e2446 100644
--- a/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt
+++ b/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt
@@ -81,7 +81,7 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver
                     null
                 }
 
-                if (value == null && isOptional) {
+                if (value == null && isOptional && environment.containsArgument(definition.name)) {
                     return@add Optional.empty<Any>()
                 }