Changeset 33631 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLTransformer.java

Timestamp:

2019-11-07T14:52:21+13:00 (4 years ago)

Author:

kjdon

Message:

added a bit more error reporting

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLTransformer.java

@@ -241 +241 @@
             TransformErrorListener transformerErrorListener = (TransformErrorListener) this.t_factory.getErrorListener();
             transformerErrorListener.setStylesheet(stylesheet);
-            Transformer transformer = this.t_factory.newTransformer(new DOMSource(stylesheet));
+            DOMSource xsl_source = new DOMSource(stylesheet);
+            if (xsl_source == null) {
+              logger.error("couldn't load stylesheet into domsource");
+              return  transformError("XMLTransformer.transform(Doc, Doc, HashMap, Doc) couldn't load stylesheet into DOMSource", null);
+            }
+            Transformer transformer = this.t_factory.newTransformer(xsl_source);
             //logger.info("XMLTransformer transformer is " + transformer); //done in ErrorListener
-
+            if (transformer == null) { // the above is never supposed to return null :-(
+               logger.error("couldn't create transformer");
+               return  transformError("XMLTransformer.transform(Doc, Doc, HashMap, Doc) couldn't load stylesheet", null);
+             }
             if (parameters != null)
             {
@@ -559 +567 @@
     protected Node transformError(String heading, Exception e)
     {
+      if (e == null) {
+        return constructErrorXHTMLPage(heading);
+      }
         String message = heading + "\n" + e.getMessage();
         logger.error(heading + ": " + e.getMessage());