Changeset 30647


Ignore:
Timestamp:
08/01/16 09:53:01 (5 years ago)
Author:
kjdon
Message:

getTextString returns null if not found, so need to check for null when using it.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

    r30629 r30647  
    507507          String s = getTextString(key, lang, dictionary_name);
    508508          // only use this one if a value was actually found
    509           if (!s.equals( "_"+key +"_")) {
     509          if (s!= null) {
    510510            return s;
    511511          }
     512          //if (!s.equals( "_"+key +"_")) {
     513          //  return s;
     514          //}
    512515        }
    513516
     
    599602          }
    600603          if(result == null) {
    601             return "_" + key + "_";
     604            //return "_" + key + "_";
     605            return null;
    602606          }
    603607        }
Note: See TracChangeset for help on using the changeset viewer.