Changeset 33080

Timestamp:

2019-05-14T20:00:36+12:00 (5 years ago)

Author:

kjdon

Message:

test for null element

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core

Files:

• MessageRouter.java (modified) (1 diff)
• Receptionist.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -648 +648 @@
     // for now, only handle paramDefault elems
     protected boolean configureFormat(Element format_elem) {
+    if (format_elem == null) {
+        return false;
+    }
     NodeList param_defaults = format_elem.getElementsByTagName(GSXML.PARAM_DEFAULT_ELEM);
     for (int i=0; i<param_defaults.getLength(); i++) {

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/Receptionist.java

@@ -405 +405 @@
     // for now, only handle paramDefault elems
     protected boolean configureFormat(Element format_elem) {
+    if (format_elem == null) {
+        return false;
+    }
     NodeList param_defaults = format_elem.getElementsByTagName(GSXML.PARAM_DEFAULT_ELEM);
     for (int i=0; i<param_defaults.getLength(); i++) {