From ffd0b84fdfbf2e69332e684e017f9810b2b085aa Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Sat, 4 Mar 2006 20:45:32 +0000
Subject:        * gnu/xml/stream/SAXParser.java (parse(InputSource)): Ignore  
      exceptions thrown by handlers while cleaning up and rethrow original    
    exception.

---
 gnu/xml/stream/SAXParser.java | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'gnu/xml/stream/SAXParser.java')

diff --git a/gnu/xml/stream/SAXParser.java b/gnu/xml/stream/SAXParser.java
index 9dd0921ba..fd768a43d 100644
--- a/gnu/xml/stream/SAXParser.java
+++ b/gnu/xml/stream/SAXParser.java
@@ -1,5 +1,5 @@
 /* SAXParser.java -- 
-   Copyright (C) 2005  Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -657,17 +657,26 @@ public class SAXParser
       }
     catch (Exception e)
       {
-        if (!startDocumentDone && contentHandler != null)
-          contentHandler.startDocument();
         SAXParseException e2 = new SAXParseException(e.getMessage(), this);
         e2.initCause(e);
-        if (errorHandler != null)
-          errorHandler.fatalError(e2);
-        if (contentHandler != null)
-          contentHandler.endDocument();
+        try
+          {
+            if (!startDocumentDone && contentHandler != null)
+              contentHandler.startDocument();
+            if (errorHandler != null)
+              errorHandler.fatalError(e2);
+            if (contentHandler != null)
+              contentHandler.endDocument();
+          }
+        catch (SAXException sex)
+          {
+            // Ignored, we will rethrow the original exception.
+          }
         reset();
         if (opened)
           in.close();
+        if (e instanceof SAXException)
+          throw (SAXException) e;
         if (e instanceof IOException)
           throw (IOException) e;
         else
-- 
cgit v1.2.1