Null check when returning resolved database

mashhurs · mashhurs · commit bf88d27104e1 · 2025-08-07T23:13:01.000-07:00
diff --git a/libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/geoip/IpDatabaseProviderBridge.java b/libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/geoip/IpDatabaseProviderBridge.java
@@ -14,6 +14,8 @@
 import org.elasticsearch.ingest.geoip.IpDatabaseProvider;
 import org.elasticsearch.logstashbridge.StableBridgeAPI;
 
+import java.util.Objects;
+
 /**
  * An external bridge for {@link Processor}
  */
@@ -59,7 +61,8 @@ public Boolean isValid(ProjectId projectId, String name) {
 
             @Override
             public IpDatabase getDatabase(ProjectId projectId, String name) {
-                return IpDatabaseProviderBridge.AbstractExternal.this.getDatabase(name).toInternal();
+                IpDatabaseBridge bridge = IpDatabaseProviderBridge.AbstractExternal.this.getDatabase(name);
+                return Objects.isNull(bridge) ? null : bridge.toInternal();
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`import org.elasticsearch.ingest.geoip.IpDatabaseProvider;`
`15`	`15`	`import org.elasticsearch.logstashbridge.StableBridgeAPI;`
`16`	`16`
	`17`	`+import java.util.Objects;`
	`18`	`+`
`17`	`19`	`/**`
`18`	`20`	`* An external bridge for {@link Processor}`
`19`	`21`	`*/`
`@@ -59,7 +61,8 @@ public Boolean isValid(ProjectId projectId, String name) {`
`59`	`61`
`60`	`62`	`@Override`
`61`	`63`	`public IpDatabase getDatabase(ProjectId projectId, String name) {`
`62`		`- return IpDatabaseProviderBridge.AbstractExternal.this.getDatabase(name).toInternal();`
	`64`	`+ IpDatabaseBridge bridge = IpDatabaseProviderBridge.AbstractExternal.this.getDatabase(name);`
	`65`	`+ return Objects.isNull(bridge) ? null : bridge.toInternal();`
`63`	`66`	`}`
`64`	`67`	`}`
`65`	`68`	`}`