Changeset 28971

Timestamp:

2014-04-14T14:36:49+12:00 (10 years ago)

Author:

kjdon

Message:

removing servletcontext gsdocument attribute. just create a new document when we need one.

File:

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

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

@@ -127 +127 @@
                 }
 
-                Document gsDoc = (Document) request.getServletContext().getAttribute("GSDocument");
-                if (gsDoc == null)
-                {
-                    _logger.error("Document is null, stopping filter");
-                    return;
-                }
+                Document gsDoc = XMLConverter.newDOM();
 
                 Element metaMessage = gsDoc.createElement(GSXML.MESSAGE_ELEM);
@@ -212 +207 @@
                     if (interfaceConfigFile.exists())
                     {
-                        XMLConverter xmlC = new XMLConverter();
-                        Document interfaceConfigDoc = xmlC.getDOM(interfaceConfigFile);
+                      Document interfaceConfigDoc = XMLConverter.getDOM(interfaceConfigFile);
 
                         String baseInterface = interfaceConfigDoc.getDocumentElement().getAttribute("baseInterface");