Changeset 30647 for main/trunk

Timestamp:

2016-08-01T09:53:01+12:00 (8 years ago)

Author:

kjdon

Message:

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

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -507 +507 @@
           String s = getTextString(key, lang, dictionary_name);
           // only use this one if a value was actually found
-          if (!s.equals( "_"+key +"_")) {
+          if (s!= null) {
             return s;
           }
+          //if (!s.equals( "_"+key +"_")) {
+          //  return s;
+          //}
         }
 
@@ -599 +602 @@
           }
           if(result == null) {
-            return "_" + key + "_";
+            //return "_" + key + "_";
+            return null;
           }
         }