NIFI-3946: Fixed issues where null values were returned instead of em…

…pty optionals
apache · May 22, 2017 · 6f09a80 · 6f09a80
1 parent d981ac0
commit 6f09a80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ifi-lookup-services/src/main/java/org/apache/nifi/lookup/SimpleKeyValueLookupService.java b/...ifi-lookup-services/src/main/java/org/apache/nifi/lookup/SimpleKeyValueLookupService.java
@@ -59,12 +59,12 @@ public void cacheConfiguredValues(final ConfigurationContext context) {
     @Override
     public Optional<String> lookup(final Map<String, String> coordinates) {
         if (coordinates == null) {
-            return null;
+            return Optional.empty();
         }
 
         final String key = coordinates.get(KEY);
         if (key == null) {
-            return null;
+            return Optional.empty();
         }
 
         return Optional.ofNullable(lookupValues.get(key));

diff --git a/...le/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java b/...le/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java
@@ -165,7 +165,7 @@ public Optional<Record> lookup(final Map<String, String> coordinates) throws Loo
 
         final String ipAddress = coordinates.get(IP_KEY);
         if (ipAddress == null) {
-            return null;
+            return Optional.empty();
         }
 
         final InetAddress inetAddress;