Changeset 11397 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2016-12-14T15:50:53+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S2259 - Null pointers should not be dereferenced

File:

• trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

@@ -221 +221 @@
      */
     public boolean isValidInfrastructureTld(String iTld) {
+        if (iTld == null) return false;
         final String key = chompLeadingDot(unicodeToASCII(iTld).toLowerCase(Locale.ENGLISH));
         return arrayContains(INFRASTRUCTURE_TLDS, key);
@@ -233 +234 @@
      */
     public boolean isValidGenericTld(String gTld) {
+        if (gTld == null) return false;
         final String key = chompLeadingDot(unicodeToASCII(gTld).toLowerCase(Locale.ENGLISH));
         return (arrayContains(GENERIC_TLDS, key) || arrayContains(genericTLDsPlus, key))
@@ -246 +248 @@
      */
     public boolean isValidCountryCodeTld(String ccTld) {
+        if (ccTld == null) return false;
         final String key = chompLeadingDot(unicodeToASCII(ccTld).toLowerCase(Locale.ENGLISH));
         return (arrayContains(COUNTRY_CODE_TLDS, key) || arrayContains(countryCodeTLDsPlus, key))
@@ -259 +262 @@
      */
     public boolean isValidLocalTld(String lTld) {
+        if (lTld == null) return false;
         final String key = chompLeadingDot(unicodeToASCII(lTld).toLowerCase(Locale.ENGLISH));
         return arrayContains(LOCAL_TLDS, key);