Hello Ottomata,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/190094
to review the following change.
Change subject: Fix potential NPE in Geocode's subdivision extraction
......................................................................
Fix potential NPE in Geocode's subdivision extraction
While not having seen such NPE's happen, we better guard against them
as the MaxMind database is outside of our control.
Bug: T89204
Change-Id: I5f068984455339d36b7309c60a1b779e9c285af6
---
M refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Geocode.java
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source
refs/changes/94/190094/1
diff --git
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Geocode.java
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Geocode.java
index f842745..fe026cd 100644
---
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Geocode.java
+++
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Geocode.java
@@ -175,7 +175,13 @@
List<Subdivision> subdivisions = response.getSubdivisions();
if (subdivisions != null && subdivisions.size() > 0) {
- geoData.put(SUBDIVISION, subdivisions.get(0).getName());
+ Subdivision subdivision = subdivisions.get(0);
+ if (subdivision != null) {
+ String name = subdivision.getName();
+ if (name != null) {
+ geoData.put(SUBDIVISION, name);
+ }
+ }
}
City city = response.getCity();
--
To view, visit https://gerrit.wikimedia.org/r/190094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f068984455339d36b7309c60a1b779e9c285af6
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: QChris <christ...@quelltextlich.at>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
