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

Timestamp:

2014-04-10T14:39:33+12:00 (10 years ago)

Author:

kjdon

Message:

Lots of changes. Mainly to do with removing this.doc from everywhere. Document is not thread safe. Now we tend to create a new Document everytime we are starting a new page/message etc. in service this.desc_doc is available as teh document to create service info stuff. But it should only be used for this and not for other messages. newDOM is now static for XMLConverter. method param changes for some GSXML methods.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/Receptionist.java (modified) (5 diffs)

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

@@ -33 +33 @@
     protected HashMap<String, Object> config_params = null;
     /** container Document to create XML Nodes */
-    protected Document doc = null;
+    //protected Document doc = null;
 
     /** a converter class to parse XML and create Docs */
@@ -54 +54 @@
     {
         this.converter = new XMLConverter();
-        this.doc = this.converter.newDOM();
+        //this.doc = XMLConverter.newDOM();
         this.action_map = new HashMap<String, Action>();
     }
@@ -182 +182 @@
     public Node process(Node message_node)
     {
-        Element message = this.converter.nodeToElement(message_node);
+        Element message = GSXML.nodeToElement(message_node);
 
         // get the request out of the message - assume that there is only one
@@ -242 +242 @@
         preProcessRequest(request);
         // set up the page
-        Element page = this.doc.createElement(GSXML.PAGE_ELEM);
+        Document doc = XMLConverter.newDOM();
+        Element page = doc.createElement(GSXML.PAGE_ELEM);
         page.setAttribute(GSXML.LANG_ATT, request.getAttribute(GSXML.LANG_ATT));
         // just in case these namespaces end up in the page and we want to display the XML
@@ -273 +274 @@
 
         // the request is part of the page
-        page.appendChild(GSXML.duplicateWithNewName(this.doc, request, GSXML.PAGE_REQUEST_ELEM, true));
+        page.appendChild(GSXML.duplicateWithNewName(doc, request, GSXML.PAGE_REQUEST_ELEM, true));
         // add the response too
-        Element page_response = GSXML.duplicateWithNewName(this.doc, (Element) GSXML.getChildByTagName(action_response, GSXML.RESPONSE_ELEM), GSXML.PAGE_RESPONSE_ELEM, true);
+        Element page_response = GSXML.duplicateWithNewName(doc, (Element) GSXML.getChildByTagName(action_response, GSXML.RESPONSE_ELEM), GSXML.PAGE_RESPONSE_ELEM, true);
         page.appendChild(page_response);