Author: ajith
Date: Tue Jul 18 05:17:04 2006
New Revision: 423066
URL: http://svn.apache.org/viewvc?rev=423066&view=rev
Log:
1.Changed the implementation of the StreamWrapper to fix the issue mentioned in
Axis2-818.
If the real parser rests at START_ELEMENT then a fake START_DOCUMENT event is
produced from getEventType. The START_DOCUMENT event is never thrown from
the next() method.
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/StreamWrapper.java
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/StreamWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/StreamWrapper.java?rev=423066&r1=423065&r2=423066&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/StreamWrapper.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/StreamWrapper.java
Tue Jul 18 05:17:04 2006
@@ -43,7 +43,7 @@
}
public void close() throws XMLStreamException {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
realReader.close();
} else {
throw new XMLStreamException();
@@ -58,10 +58,10 @@
case STATE_INIT:
if (realReader.getEventType() == START_DOCUMENT) {
state = STATE_SWITCHED;
- returnEvent = realReader.getEventType();
+ returnEvent = realReader.next();
} else {
- state = STATE_SWITCH_AT_NEXT;
- returnEvent = START_DOCUMENT;
+ state = STATE_SWITCHED;
+ returnEvent = realReader.getEventType();
}
break;
case STATE_SWITCHED:
@@ -72,10 +72,10 @@
state = STATE_COMPLETE_AT_NEXT;
}
break;
- case STATE_SWITCH_AT_NEXT:
- state = STATE_SWITCHED;
- returnEvent = realReader.getEventType();
- break;
+// case STATE_SWITCH_AT_NEXT:
+// state = STATE_SWITCHED;
+// returnEvent = realReader.getEventType();
+// break;
case STATE_COMPLETE_AT_NEXT:
state = STATE_COMPLETED;
returnEvent = END_DOCUMENT;
@@ -99,13 +99,13 @@
}
public void require(int i, String s, String s1) throws XMLStreamException {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
realReader.require(i, s, s1);
}
}
public boolean standaloneSet() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.standaloneSet();
} else {
return false;
@@ -113,7 +113,7 @@
}
public int getAttributeCount() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getAttributeCount();
} else {
return 0;
@@ -121,7 +121,7 @@
}
public String getAttributeLocalName(int i) {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getAttributeLocalName(i);
} else {
return null;
@@ -129,7 +129,7 @@
}
public QName getAttributeName(int i) {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getAttributeName(i);
} else {
return null;
@@ -137,7 +137,7 @@
}
public String getAttributeNamespace(int i) {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getAttributeNamespace(i);
} else {
return null;
@@ -145,7 +145,7 @@
}
public String getAttributePrefix(int i) {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getAttributePrefix(i);
} else {
return null;
@@ -153,7 +153,7 @@
}
public String getAttributeType(int i) {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getAttributeType(i);
} else {
return null;
@@ -161,7 +161,7 @@
}
public String getAttributeValue(int i) {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getAttributeValue(i);
} else {
return null;
@@ -169,7 +169,7 @@
}
public String getAttributeValue(String s, String s1) {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getAttributeValue(s, s1);
} else {
return null;
@@ -177,7 +177,7 @@
}
public String getCharacterEncodingScheme() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getCharacterEncodingScheme();
} else {
return null;
@@ -185,7 +185,7 @@
}
public String getElementText() throws XMLStreamException {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getElementText();
} else {
throw new XMLStreamException();
@@ -193,7 +193,7 @@
}
public String getEncoding() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getEncoding();
} else {
return null;
@@ -201,7 +201,7 @@
}
public int getEventType() {
- if (prevState == STATE_INIT) {
+ if (state == STATE_INIT) {
return START_DOCUMENT;
} else {
return realReader.getEventType();
@@ -209,7 +209,7 @@
}
public String getLocalName() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getLocalName();
} else {
return null;
@@ -217,7 +217,7 @@
}
public Location getLocation() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getLocation();
} else {
return null;
@@ -225,7 +225,7 @@
}
public QName getName() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getName();
} else {
return null;
@@ -233,7 +233,7 @@
}
public NamespaceContext getNamespaceContext() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getNamespaceContext();
} else {
return null;
@@ -241,7 +241,7 @@
}
public int getNamespaceCount() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getNamespaceCount();
} else {
return 0;
@@ -249,7 +249,7 @@
}
public String getNamespacePrefix(int i) {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getNamespacePrefix(i);
} else {
return null;
@@ -257,7 +257,7 @@
}
public String getNamespaceURI() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getNamespaceURI();
} else {
return null;
@@ -265,7 +265,7 @@
}
public String getNamespaceURI(int i) {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getNamespaceURI(i);
} else {
return null;
@@ -273,7 +273,7 @@
}
public String getNamespaceURI(String s) {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getNamespaceURI(s);
} else {
return null;
@@ -281,7 +281,7 @@
}
public String getPIData() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getPIData();
} else {
return null;
@@ -289,7 +289,7 @@
}
public String getPITarget() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getPITarget();
} else {
return null;
@@ -297,7 +297,7 @@
}
public String getPrefix() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getPrefix();
} else {
return null;
@@ -305,7 +305,7 @@
}
public Object getProperty(String s) throws IllegalArgumentException {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getProperty(s);
} else {
throw new IllegalArgumentException();
@@ -313,7 +313,7 @@
}
public String getText() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getText();
} else {
return null;
@@ -321,7 +321,7 @@
}
public char[] getTextCharacters() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getTextCharacters();
} else {
return new char[0];
@@ -329,7 +329,7 @@
}
public int getTextCharacters(int i, char[] chars, int i1, int i2) throws
XMLStreamException {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getTextCharacters(i, chars, i1, i2);
} else {
return 0;
@@ -337,7 +337,7 @@
}
public int getTextLength() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getTextLength();
} else {
return 0;
@@ -345,7 +345,7 @@
}
public int getTextStart() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getTextStart();
} else {
return 0;
@@ -353,7 +353,7 @@
}
public String getVersion() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.getVersion();
} else {
return null;
@@ -361,7 +361,7 @@
}
public boolean hasName() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.hasName();
} else {
return false;
@@ -373,7 +373,7 @@
return true;
} else if (state == STATE_COMPLETED) {
return false;
- } else if (prevState != STATE_INIT) {
+ } else if (state != STATE_INIT) {
return realReader.hasNext();
} else {
return true;
@@ -381,7 +381,7 @@
}
public boolean hasText() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.hasText();
} else {
return false;
@@ -389,7 +389,7 @@
}
public boolean isAttributeSpecified(int i) {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.isAttributeSpecified(i);
} else {
return false;
@@ -397,7 +397,7 @@
}
public boolean isCharacters() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.isCharacters();
} else {
return false;
@@ -405,7 +405,7 @@
}
public boolean isEndElement() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.isEndElement();
} else {
return false;
@@ -413,7 +413,7 @@
}
public boolean isStandalone() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.isStandalone();
} else {
return false;
@@ -421,7 +421,7 @@
}
public boolean isStartElement() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.isStartElement();
} else {
return false;
@@ -429,7 +429,7 @@
}
public boolean isWhiteSpace() {
- if (prevState != STATE_INIT) {
+ if (state != STATE_INIT) {
return realReader.isWhiteSpace();
} else {
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
