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

Timestamp:

2014-02-27T14:25:44+13:00 (10 years ago)

Author:

kjdon

Message:

removed all use of this.doc. I have left the variable in though so I don't have to update all service classes at this stage. Eventually want to remove this.doc altogether, as DOM is not thread safe.

File:

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

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

@@ -78 +78 @@
 
     /** XML element for describe requests - the container doc */
-    protected Document doc = null;
+       protected Document doc = null;
 
     /**
@@ -223 +223 @@
 
         NodeList requests = message.getElementsByTagName(GSXML.REQUEST_ELEM);
-        Element mainResult = this.doc.createElement(GSXML.MESSAGE_ELEM);
+        Document doc = this.converter.newDOM();
+        Element mainResult = doc.createElement(GSXML.MESSAGE_ELEM);
         if (requests.getLength() == 0)
         {
@@ -240 +241 @@
                 if (response != null)
                 {
-                    mainResult.appendChild(this.doc.importNode(response, true));
+                    mainResult.appendChild(doc.importNode(response, true));
                 }
 
@@ -247 +248 @@
             {
                 Element response = processFormat(request);
-                mainResult.appendChild(this.doc.importNode(response, true));
+                mainResult.appendChild(doc.importNode(response, true));
             }
             else
@@ -311 +312 @@
                 if (response != null)
                 {
-                    mainResult.appendChild(this.doc.importNode(response, true));
+                    mainResult.appendChild(doc.importNode(response, true));
                 }
                 else
@@ -317 +318 @@
                     // add in a dummy response
                     logger.error("adding in an error element\n");
-                    response = this.doc.createElement(GSXML.RESPONSE_ELEM);
-                    GSXML.addError(this.doc, response, error_string.toString());
+                    response = doc.createElement(GSXML.RESPONSE_ELEM);
+                    GSXML.addError(doc, response, error_string.toString());
                     mainResult.appendChild(response);
 
@@ -335 +336 @@
     protected Element processDescribe(Element request)
     {
-
-        Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+      Document doc = this.converter.newDOM();
+        Element response = doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
 
@@ -343 +344 @@
         if (to.equals(""))
         { // return the service list
-            response.appendChild(getServiceList(lang));
+          response.appendChild(doc.importNode(getServiceList(lang), true));
             return response;
         }
@@ -378 +379 @@
         if (description != null)
         { // may be null if non-existant service
-            response.appendChild(description);
+          response.appendChild(doc.importNode(description, true));
         }
         return response;
@@ -389 +390 @@
     protected Element processFormat(Element request)
     {
-        Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+      Document doc = this.converter.newDOM();
+        Element response = doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_FORMAT);
 
@@ -402 +404 @@
         if (this.format_info_map.containsKey(to))
         {
-            response.appendChild(response.getOwnerDocument().importNode(getServiceFormat(to), true));
+            response.appendChild(doc.importNode(getServiceFormat(to), true));
             if (_globalFormat != null)
             {
-                response.appendChild(response.getOwnerDocument().importNode(GSXML.duplicateWithNewName(response.getOwnerDocument(), _globalFormat, GSXML.GLOBAL_FORMAT_ELEM, false), true));
+                response.appendChild(GSXML.duplicateWithNewName(doc, _globalFormat, GSXML.GLOBAL_FORMAT_ELEM, false));
             }
             response.setAttribute(GSXML.FROM_ATT, to);