2006-01-14 Chris Burdess <dog@gnu.org>

	* gnu/xml/stream/SAXParser.java: Ensure that parser is reset
	  correctly when I/O and runtime exceptions occur during parsing.

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index fed55ca1a..12bf486aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-14  Chris Burdess  <dog@gnu.org>
+
+	* gnu/xml/stream/SAXParser.java: Ensure that parser is reset
+	  correctly when I/O and runtime exceptions occur during parsing.
+
 2006-01-13  Roman Kennke  <kennke@aicas.com>
 
 	* gnu/java/awt/peer/swing/SwingButtonPeer.java,
diff --git a/gnu/xml/stream/SAXParser.java b/gnu/xml/stream/SAXParser.java
index 54c8b3624..3b1841b8c 100644
--- a/gnu/xml/stream/SAXParser.java
+++ b/gnu/xml/stream/SAXParser.java
@@ -650,7 +650,7 @@ public class SAXParser
               }
           }
       }
-    catch (XMLStreamException e)
+    catch (Exception e)
       {
         if (!startDocumentDone && contentHandler != null)
           contentHandler.startDocument();
@@ -664,9 +664,9 @@ public class SAXParser
       }
     finally
       {
+        reset();
         if (opened)
           in.close();
-        reset();
       }
   }