commit 0cc1fc7cf0c99a81d6a4d44c7c96d367944b0c72
author Henry Zongaro <zongaro@apache.org> Mon Apr 02 15:51:39 2007 +0000
committer Henry Zongaro <zongaro@apache.org> Mon Apr 02 15:51:39 2007 +0000
tree ab4a35f8dd34a929ec4f823e8df7a60fb779fd3a
parent 66dc5b503bb0f72c010a81f280c636ec42121a70

Part of fix for Jira issue XALANJ-2375.

Changed default constructor to defer creating a PrintWriter through which to
report any error messages until a message actually needs to be reported.  A
PrintWriter instance consumes a substantial amount of space, and deferring its
creation saves initialization time for the XPath API and XSLT.

Reviewed by Christine Li (jycli () ca ! ibm ! com).

src/org/apache/xml/utils/DefaultErrorHandler.java

diff --git a/src/org/apache/xml/utils/DefaultErrorHandler.java b/src/org/apache/xml/utils/DefaultErrorHandler.java
index c52c53f..819f8e1 100644
--- a/src/org/apache/xml/utils/DefaultErrorHandler.java
+++ b/src/org/apache/xml/utils/DefaultErrorHandler.java
@@ -79,10 +79,24 @@
    */
   public DefaultErrorHandler(boolean throwExceptionOnError)
   {
-    m_pw = new PrintWriter(System.err, true);
+    // Defer creation of a PrintWriter until it's actually needed
     m_throwExceptionOnError = throwExceptionOnError;
   }
 
+  /**
+   * Retrieve <code>java.io.PrintWriter</code> to which errors are being
+   * directed.
+   * @return The <code>PrintWriter</code> installed via the constructor
+   *         or the default <code>PrintWriter</code>
+   */
+  public PrintWriter getErrorWriter() {
+    // Defer creating the java.io.PrintWriter until an error needs to be
+    // reported.
+    if (m_pw == null) {
+      m_pw = new PrintWriter(System.err, true);
+    }
+    return m_pw;
+  }
 
   /**
    * Receive notification of a warning.
@@ -102,8 +116,10 @@
    */
   public void warning(SAXParseException exception) throws SAXException
   {
-    printLocation(m_pw, exception);
-    m_pw.println("Parser warning: " + exception.getMessage());
+    PrintWriter pw = getErrorWriter();
+
+    printLocation(pw, exception);
+    pw.println("Parser warning: " + exception.getMessage());
   }
 
   /**
@@ -130,7 +146,7 @@
   public void error(SAXParseException exception) throws SAXException
   {
     //printLocation(exception);
-    // m_pw.println(exception.getMessage());
+    // getErrorWriter().println(exception.getMessage());
 
     throw exception;
   }
@@ -157,7 +173,7 @@
   public void fatalError(SAXParseException exception) throws SAXException
   {
     // printLocation(exception);
-    // m_pw.println(exception.getMessage());
+    // getErrorWriter().println(exception.getMessage());
 
     throw exception;
   }
@@ -181,9 +197,10 @@
    */
   public void warning(TransformerException exception) throws TransformerException
   {
-    printLocation(m_pw, exception);
+    PrintWriter pw = getErrorWriter();
 
-    m_pw.println(exception.getMessage());
+    printLocation(pw, exception);
+    pw.println(exception.getMessage());
   }
 
   /**
@@ -216,8 +233,10 @@
       throw exception;
     else
     {
-      printLocation(m_pw, exception);
-      m_pw.println(exception.getMessage());
+      PrintWriter pw = getErrorWriter();
+
+      printLocation(pw, exception);
+      pw.println(exception.getMessage());
     }
   }
 
@@ -249,8 +268,10 @@
       throw exception;
     else
     {
-      printLocation(m_pw, exception);
-      m_pw.println(exception.getMessage());
+      PrintWriter pw = getErrorWriter();
+
+      printLocation(pw, exception);
+      pw.println(exception.getMessage());
     }
   }
   
@@ -327,7 +348,7 @@
         
     if(null != locator)
     {
-      // m_pw.println("Parser fatal error: "+exception.getMessage());
+      // getErrorWriter().println("Parser fatal error: "+exception.getMessage());
       String id = (null != locator.getPublicId() )
                   ? locator.getPublicId()
                     : (null != locator.getSystemId())