morten      01/10/08 06:30:52

  Modified:    java/src/org/apache/xalan/xsltc/trax
                        TransformerFactoryImpl.java TransformerImpl.java
  Log:
  A fix for a recent regression in our internal error handling.
  PR:           n/a
  Obtained from:        n/a
  Submitted by: [EMAIL PROTECTED]/apache/org
  Reviewed by:  [EMAIL PROTECTED]
  
  Revision  Changes    Path
  1.22      +4 -4      
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java
  
  Index: TransformerFactoryImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- TransformerFactoryImpl.java       2001/10/08 12:06:52     1.21
  +++ TransformerFactoryImpl.java       2001/10/08 13:30:52     1.22
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: TransformerFactoryImpl.java,v 1.21 2001/10/08 12:06:52 morten 
Exp $
  + * @(#)$Id: TransformerFactoryImpl.java,v 1.22 2001/10/08 13:30:52 morten 
Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -648,7 +648,7 @@
        throws TransformerException {
        System.err.println("ERROR: "+e.getMessageAndLocation());
        Throwable wrapped = e.getException();
  -     if (e != null)
  +     if (wrapped != null)
            System.err.println("     : "+wrapped.getMessage());
        throw(e);       
       }
  @@ -670,7 +670,7 @@
        throws TransformerException {
        System.err.println("FATAL: "+e.getMessageAndLocation());
        Throwable wrapped = e.getException();
  -     if (e != null)
  +     if (wrapped != null)
            System.err.println("     : "+wrapped.getMessage());
        throw(e);
       }
  @@ -692,7 +692,7 @@
        throws TransformerException {
        System.err.println("WARNING: "+e.getMessageAndLocation());
        Throwable wrapped = e.getException();
  -     if (e != null)
  +     if (wrapped != null)
            System.err.println("       : "+wrapped.getMessage());
       }
   
  
  
  
  1.21      +4 -4      
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java
  
  Index: TransformerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- TransformerImpl.java      2001/10/08 12:06:52     1.20
  +++ TransformerImpl.java      2001/10/08 13:30:52     1.21
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: TransformerImpl.java,v 1.20 2001/10/08 12:06:52 morten Exp $
  + * @(#)$Id: TransformerImpl.java,v 1.21 2001/10/08 13:30:52 morten Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -823,7 +823,7 @@
        throws TransformerException {
        System.err.println("ERROR: "+e.getMessageAndLocation());
        Throwable wrapped = e.getException();
  -     if (e != null)
  +     if (wrapped != null)
            System.err.println("     : "+wrapped.getMessage());
        throw(e);       
       }
  @@ -845,7 +845,7 @@
        throws TransformerException {
        System.err.println("FATAL: "+e.getMessageAndLocation());
        Throwable wrapped = e.getException();
  -     if (e != null)
  +     if (wrapped != null)
            System.err.println("     : "+wrapped.getMessage());
        throw(e);
       }
  @@ -867,7 +867,7 @@
        throws TransformerException {
        System.err.println("WARNING: "+e.getMessageAndLocation());
        Throwable wrapped = e.getException();
  -     if (e != null)
  +     if (wrapped != null)
            System.err.println("       : "+wrapped.getMessage());
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to