summaryrefslogtreecommitdiff
path: root/gnu/xml
diff options
context:
space:
mode:
authorChris Burdess <dog@bluezoo.org>2007-07-28 15:38:13 +0000
committerChris Burdess <dog@bluezoo.org>2007-07-28 15:38:13 +0000
commit8d010878d2717473043bcdbe702113e9ef67fa0e (patch)
tree586e3551058787de6ca5ee1d62cb7e71ef6a446e /gnu/xml
parent62b7f07c6c3ccd698a9c2c7ed9fa39b0ab8edf69 (diff)
downloadclasspath-8d010878d2717473043bcdbe702113e9ef67fa0e.tar.gz
2007-07-28 Chris Burdess <dog@gnu.org>
PR 32539 * gnu/xml/stream/XMLParser.java: don't call next() during hasNext().
Diffstat (limited to 'gnu/xml')
-rw-r--r--gnu/xml/stream/XMLParser.java19
1 files changed, 1 insertions, 18 deletions
diff --git a/gnu/xml/stream/XMLParser.java b/gnu/xml/stream/XMLParser.java
index c1eee946e..049575ac7 100644
--- a/gnu/xml/stream/XMLParser.java
+++ b/gnu/xml/stream/XMLParser.java
@@ -178,11 +178,6 @@ public class XMLParser
private int event;
/**
- * Whether we are looking ahead. Used by hasNext.
- */
- private boolean lookahead;
-
- /**
* The element name stack. The first element in this stack will be the
* root element.
*/
@@ -1013,24 +1008,12 @@ public class XMLParser
public boolean hasNext()
throws XMLStreamException
{
- if (event == XMLStreamConstants.END_DOCUMENT)
- return false;
- if (!lookahead)
- {
- next();
- lookahead = true;
- }
- return event != -1;
+ return (event != XMLStreamConstants.END_DOCUMENT && event != -1);
}
public int next()
throws XMLStreamException
{
- if (lookahead)
- {
- lookahead = false;
- return event;
- }
if (event == XMLStreamConstants.END_ELEMENT)
{
// Pop namespace context