'#1487 Better null pointer treatment for erroneous or incomplete

nominatim responses that do not add certain nominatim fields.
sepinf-inc · Sep 21, 2023 · d36fc22 · d36fc22
1 parent ebdcd51
commit d36fc22
Showing 1 changed file with 35 additions and 29 deletions.
diff --git a/iped-geo/src/main/java/iped/geo/nominatim/ui/NominatimTreeModel.java b/iped-geo/src/main/java/iped/geo/nominatim/ui/NominatimTreeModel.java
@@ -165,11 +165,13 @@ public ArrayList<Country> getCountries() {
 
             try {
                 SortedSetDocValues ssdv = reader.getSortedSetDocValues(NominatimTask.NOMINATIM_COUNTRY_METADATA);
-                TermsEnum te = ssdv.termsEnum();
-                BytesRef br = te.next();
-                while (br != null) {
-                    countries.add(new Country(br.utf8ToString()));
-                    br = te.next();
+                if (ssdv != null) {
+                    TermsEnum te = ssdv.termsEnum();
+                    BytesRef br = te.next();
+                    while (br != null) {
+                        countries.add(new Country(br.utf8ToString()));
+                        br = te.next();
+                    }
                 }
             } catch (IOException e) {
                 // TODO Auto-generated catch block
@@ -192,20 +194,22 @@ public State[] getStates(Country country) {
 
             try {
                 SortedSetDocValues ssdv = reader.getSortedSetDocValues(NominatimTask.NOMINATIM_STATE_METADATA);
-                TermsEnum te = ssdv.termsEnum();
-                BytesRef br = te.next();
-                while (br != null) {
-                    String stateCompleteName = br.utf8ToString();
-                    if (stateCompleteName.startsWith(country.name)) {
-                        found = true;
-                        states.add(new State(country, stateCompleteName));
-                    } else {
-                        if (found) {
-                            // it is not necessary to loop till the end as the data is sorted
-                            break;
+                if (ssdv != null) {
+                    TermsEnum te = ssdv.termsEnum();
+                    BytesRef br = te.next();
+                    while (br != null) {
+                        String stateCompleteName = br.utf8ToString();
+                        if (stateCompleteName.startsWith(country.name)) {
+                            found = true;
+                            states.add(new State(country, stateCompleteName));
+                        } else {
+                            if (found) {
+                                // it is not necessary to loop till the end as the data is sorted
+                                break;
+                            }
                         }
+                        br = te.next();
                     }
-                    br = te.next();
                 }
             } catch (IOException e) {
                 // TODO Auto-generated catch block
@@ -235,20 +239,22 @@ public City[] getCities(State state) {
 
             try {
                 SortedSetDocValues ssdv = reader.getSortedSetDocValues(NominatimTask.NOMINATIM_CITY_METADATA);
-                TermsEnum te = ssdv.termsEnum();
-                BytesRef br = te.next();
-                while (br != null) {
-                    String cityCompleteName = br.utf8ToString();
-                    if (cityCompleteName.startsWith(state.name)) {
-                        found = true;
-                        cities.add(new City(state.country, state, cityCompleteName));
-                    } else {
-                        if (found) {
-                            // it is not necessary to loop till the end as the data is sorted
-                            break;
+                if (ssdv != null) {
+                    TermsEnum te = ssdv.termsEnum();
+                    BytesRef br = te.next();
+                    while (br != null) {
+                        String cityCompleteName = br.utf8ToString();
+                        if (cityCompleteName.startsWith(state.name)) {
+                            found = true;
+                            cities.add(new City(state.country, state, cityCompleteName));
+                        } else {
+                            if (found) {
+                                // it is not necessary to loop till the end as the data is sorted
+                                break;
+                            }
                         }
+                        br = te.next();
                     }
-                    br = te.next();
                 }
             } catch (IOException e) {
                 // TODO Auto-generated catch block