idk/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues 2 Pull Requests Actions 2 Packages Projects Releases Wiki Activity

GeoIP: Fix NPE (thx parg)

Browse Source
This commit is contained in:
zzz
2018-12-17 11:24:27 +00:00
parent cae5dcd69c
commit 3867beb198
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
router/java/src/net/i2p/router/transport/GeoIP.java
View File

@@ -174,7 +174,10 @@ public class GeoIP {
// returns upper case or "--" // returns upper case or "--"
String uc = ls.getCountry(ip).getCode(); String uc = ls.getCountry(ip).getCode();
if (!uc.equals(UNKNOWN_COUNTRY_CODE)) { if (!uc.equals(UNKNOWN_COUNTRY_CODE)) {
String cached = _codeCache.get(uc.toLowerCase(Locale.US)); String lc = uc.toLowerCase(Locale.US);
String cached = _codeCache.get(lc);
if (cached == null)
cached = lc;
_IPToCountry.put(ipl, cached); _IPToCountry.put(ipl, cached);
} else { } else {
_notFound.add(ipl); _notFound.add(ipl);
@@ -197,7 +200,10 @@ public class GeoIP {
// returns upper case or null // returns upper case or null
String uc = dbr.country(ipv4); String uc = dbr.country(ipv4);
if (uc != null) { if (uc != null) {
String cached = _codeCache.get(uc.toLowerCase(Locale.US)); String lc = uc.toLowerCase(Locale.US);
String cached = _codeCache.get(lc);
if (cached == null)
cached = lc;
_IPToCountry.put(ipl, cached); _IPToCountry.put(ipl, cached);
} else { } else {
_notFound.add(ipl); _notFound.add(ipl);
@@ -262,7 +268,10 @@ public class GeoIP {
// returns upper case or null // returns upper case or null
String uc = dbr.country(ipv6); String uc = dbr.country(ipv6);
if (uc != null) { if (uc != null) {
String cached = _codeCache.get(uc.toLowerCase(Locale.US)); String lc = uc.toLowerCase(Locale.US);
String cached = _codeCache.get(lc);
if (cached == null)
cached = lc;
_IPToCountry.put(ipl, cached); _IPToCountry.put(ipl, cached);
} else { } else {
_notFound.add(ipl); _notFound.add(ipl);