Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-24 05:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(assistant) Fix NPE when IP information is absent

Browse Source
This commit is contained in:
Viktor Lofgren 2024-09-25 20:19:17 +02:00
parent 9224176202
commit 95cde242ca
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
code/functions/domain-info/java/nu/marginalia/functions/domains/DomainInformationService.java
View File

@ -1,20 +1,20 @@
package nu.marginalia.functions.domains; package nu.marginalia.functions.domains;
import com.zaxxer.hikari.HikariDataSource;
import nu.marginalia.api.domains.RpcDomainInfoResponse;
import nu.marginalia.api.linkgraph.AggregateLinkGraphClient;
import nu.marginalia.geoip.GeoIpDictionary;
import nu.marginalia.model.EdgeDomain;
import nu.marginalia.db.DbDomainQueries;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import com.zaxxer.hikari.HikariDataSource;
import nu.marginalia.api.domains.RpcDomainInfoResponse;
import nu.marginalia.api.linkgraph.AggregateLinkGraphClient;
import nu.marginalia.db.DbDomainQueries;
import nu.marginalia.geoip.GeoIpDictionary;
import nu.marginalia.model.EdgeDomain;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.*; import java.util.Objects;
import java.util.Optional;
@Singleton @Singleton
public class DomainInformationService { public class DomainInformationService {
@ -63,7 +63,8 @@ public class DomainInformationService {
if (rs.next()) { if (rs.next()) {
String ip = rs.getString("IP"); String ip = rs.getString("IP");
builder.setIp(ip); builder.setIp(Objects.requireNonNullElse(ip, ""));
geoIpDictionary.getAsnInfo(ip).ifPresent(asnInfo -> { geoIpDictionary.getAsnInfo(ip).ifPresent(asnInfo -> {
builder.setAsn(asnInfo.asn()); builder.setAsn(asnInfo.asn());
builder.setAsnOrg(asnInfo.org()); builder.setAsnOrg(asnInfo.org());

1
code/libraries/geo-ip/java/nu/marginalia/geoip/GeoIpDictionary.java
View File

@ -71,7 +71,6 @@ public class GeoIpDictionary {
try { try {
return getAsnInfo(InetAddress.getByName(ip)); return getAsnInfo(InetAddress.getByName(ip));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
return Optional.empty(); return Optional.empty();
} }
} }