1 files changed, 36 insertions, 3 deletions
diff --git a/libjava/classpath/gnu/xml/stream/XMLEventReaderImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventReaderImpl.java
index 70481d7c407..bb64b1e3f9d 100644
--- a/libjava/classpath/gnu/xml/stream/XMLEventReaderImpl.java
+++ b/libjava/classpath/gnu/xml/stream/XMLEventReaderImpl.java
@@ -67,7 +67,7 @@ public class XMLEventReaderImpl
     this.systemId = systemId;
   }
 
-  public XMLEvent next()
+  public XMLEvent nextEvent()
     throws XMLStreamException
   {
     XMLEvent ret = peek();
@@ -75,10 +75,32 @@ public class XMLEventReaderImpl
     return ret;
   }
 
+  public Object next()
+  {
+    try
+      {
+        return nextEvent();
+      }
+    catch (XMLStreamException e)
+      {
+        RuntimeException e2 = new RuntimeException();
+        e2.initCause(e);
+        throw e2;
+      }
+  }
+
   public boolean hasNext()
-    throws XMLStreamException
   {
-    return peekEvent != null || reader.hasNext();
+    if (peekEvent != null)
+      return true;
+    try
+      {
+        return reader.hasNext();
+      }
+    catch (XMLStreamException e)
+      {
+        return false;
+      }
   }
   
   public XMLEvent peek()
@@ -121,5 +143,16 @@ public class XMLEventReaderImpl
     return reader.getProperty(name);
   }
 
+  public void close()
+    throws XMLStreamException
+  {
+    reader.close();
+  }
+
+  public void remove()
+  {
+    throw new UnsupportedOperationException();
+  }
+
 }