craigmcc    02/03/10 21:01:54

  Modified:    digester build.xml
               digester/src/java/org/apache/commons/digester Digester.java
  Log:
  Instead of swallowing Throwables inside a rethrown SAXException, simply
  log and rethrow any Error that occurs so that things like OutOfMemoryError
  problems are not masked by being wrapped in a SAXException.
  
  PR: Bugzilla #6290
  Submitted by: David H. Martin <dmartin at altoweb.com>
  
  Revision  Changes    Path
  1.21      +2 -3      jakarta-commons/digester/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/build.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build.xml 31 Jan 2002 20:25:11 -0000      1.20
  +++ build.xml 11 Mar 2002 05:01:54 -0000      1.21
  @@ -3,7 +3,7 @@
   
   <!--
           "Digester" component of the Jakarta Commons Subproject
  -        $Id: build.xml,v 1.20 2002/01/31 20:25:11 rdonkin Exp $
  +        $Id: build.xml,v 1.21 2002/03/11 05:01:54 craigmcc Exp $
   -->
   
   
  @@ -246,8 +246,7 @@
                                  test.matching,
                                  test.matching.extended,
                                  test.rule,
  -                               test.bpsr,
  -                               test.xmlrules
  +                               test.bpsr
                                 "
      description="Run all unit test cases">
     </target>
  
  
  
  1.47      +16 -16    
jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java
  
  Index: Digester.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- Digester.java     27 Feb 2002 18:06:09 -0000      1.46
  +++ Digester.java     11 Mar 2002 05:01:54 -0000      1.47
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java,v
 1.46 2002/02/27 18:06:09 craigmcc Exp $
  - * $Revision: 1.46 $
  - * $Date: 2002/02/27 18:06:09 $
  + * $Header: 
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java,v
 1.47 2002/03/11 05:01:54 craigmcc Exp $
  + * $Revision: 1.47 $
  + * $Date: 2002/03/11 05:01:54 $
    *
    * ====================================================================
    *
  @@ -112,7 +112,7 @@
    *
    * @author Craig McClanahan
    * @author Scott Sanders
  - * @version $Revision: 1.46 $ $Date: 2002/02/27 18:06:09 $
  + * @version $Revision: 1.47 $ $Date: 2002/03/11 05:01:54 $
    */
   
   public class Digester extends DefaultHandler {
  @@ -748,9 +748,9 @@
               } catch (Exception e) {
                   log.error("Finish event threw exception", e);
                   throw createSAXException(e);
  -            } catch (Throwable t) {
  -                log.error("Finish event threw exception", t);
  -                throw createSAXException(t.getMessage());
  +            } catch (Error e) {
  +                log.error("Finish event threw error", e);
  +                throw e;
               }
           }
   
  @@ -800,9 +800,9 @@
                   } catch (Exception e) {
                       log.error("Body event threw exception", e);
                       throw createSAXException(e);
  -                } catch (Throwable t) {
  -                    log.error("Body event threw exception", t);
  -                    throw createSAXException(t.getMessage());
  +                } catch (Error e) {
  +                    log.error("Body event threw error", e);
  +                    throw e;
                   }
               }
           } else {
  @@ -830,9 +830,9 @@
                   } catch (Exception e) {
                       log.error("End event threw exception", e);
                       throw createSAXException(e);
  -                } catch (Throwable t) {
  -                    log.error("End event threw exception", t);
  -                    throw createSAXException(t.getMessage());
  +                } catch (Error e) {
  +                    log.error("End event threw error", e);
  +                    throw e;
                   }
               }
           }
  @@ -1030,9 +1030,9 @@
                   } catch (Exception e) {
                       log.error("Begin event threw exception", e);
                       throw createSAXException(e);
  -                } catch (Throwable t) {
  -                    log.error("Begin event threw exception", t);
  -                    throw createSAXException(t.getMessage());
  +                } catch (Error e) {
  +                    log.error("Begin event threw error", e);
  +                    throw e;
                   }
               }
           } else {
  
  
  

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

Reply via email to