Better null handling

joegallo · Oct 15, 2024 · cba0c56 · cba0c56
1 parent d5fae2a
commit cba0c56
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.../ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/EnterpriseGeoIpDownloader.java b/.../ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/EnterpriseGeoIpDownloader.java
@@ -500,7 +500,7 @@ public HttpClient.PasswordAuthenticationHolder buildCredentials() {
 
         @Override
         public boolean validCredentials() {
-            return auth.get() != null;
+            return auth != null && auth.get() != null;
         }
 
         @Override
@@ -541,7 +541,7 @@ public CheckedSupplier<InputStream, IOException> download() {
 
         @Override
         public void close() throws IOException {
-            auth.close();
+            if (auth != null) auth.close();
         }
     }
 
@@ -572,7 +572,7 @@ public HttpClient.PasswordAuthenticationHolder buildCredentials() {
 
         @Override
         public boolean validCredentials() {
-            return auth.get() != null;
+            return auth != null && auth.get() != null;
         }
 
         private static final Set<String> FREE_DATABASES = Set.of("asn", "country", "country_asn");
@@ -635,7 +635,7 @@ public CheckedSupplier<InputStream, IOException> download() {
 
         @Override
         public void close() throws IOException {
-            auth.close();
+            if (auth != null) auth.close();
         }
     }