Changeset 32115 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/CollectionGroups.java

Timestamp:

2018-02-06T04:30:59+13:00 (6 years ago)

Author:

Georgiy Litvinov

Message:

Fixed NPE in case empty group title

File:

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

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

@@ -6 +6 @@
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.Request;
 import org.greenstone.gsdl3.util.UserContext;
 import org.greenstone.gsdl3.util.XMLConverter;
@@ -277 +278 @@
             Element groupDescription = getGroupDescription(name);
             Element titleEl = (Element) GSXML.getChildByTagName(groupDescription, GSXML.TITLE_ELEM);
-            String title = titleEl.getTextContent();
+            String title;
+            if (titleEl != null) {
+                 title = titleEl.getTextContent();  
+            } else {
+                title = name;
+            }
             group.setAttribute(GSXML.TITLE_ELEM, title  );
             addGroupInfo(group, newPath);
@@ -482 +488 @@
         Document doc = XMLConverter.newDOM();
         // Get the message router info
-        Element mr_info_message = doc.createElement(GSXML.MESSAGE_ELEM);
-        Element mr_request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_DESCRIBE, "", userContext);
-        mr_info_message.appendChild(mr_request);
-        Element mr_info_response_message = (Element) this.router.process(mr_info_message);
-        if (mr_info_response_message == null) {
+        Element inforesponseMessage = new Request(doc, userContext, router, GSXML.REQUEST_TYPE_DESCRIBE).send();
+        if (inforesponseMessage == null) {
             logger.error(" couldn't query the message router!");
             return null;
         }
-        Element mr_info_response = (Element) GSXML.getChildByTagName(mr_info_response_message, GSXML.RESPONSE_ELEM);
+        Element mr_info_response = (Element) GSXML.getChildByTagName(inforesponseMessage, GSXML.RESPONSE_ELEM);
         if (mr_info_response == null) {
             logger.error("Message router response is null!");