moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-13 11:12:22 -05:00
Code Issues Releases Wiki Activity

Fix XMLStreamUtil regression

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1393 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-08-28 20:31:17 +00:00
parent 4962684d0f
commit 98ae8917c0
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/davmail/caldav/CaldavConnection.java
View File

@ -1376,7 +1376,7 @@ public class CaldavConnection extends AbstractConnection {
try { try {
streamReader = XMLStreamUtil.createXMLStreamReader(body); streamReader = XMLStreamUtil.createXMLStreamReader(body);
while (streamReader.hasNext()) { while (streamReader.hasNext()) {
streamReader.nextTag(); streamReader.next();
if (XMLStreamUtil.isStartTag(streamReader)) { if (XMLStreamUtil.isStartTag(streamReader)) {
String tagLocalName = streamReader.getLocalName(); String tagLocalName = streamReader.getLocalName();
if ("prop".equals(tagLocalName)) { if ("prop".equals(tagLocalName)) {

2
src/java/davmail/exchange/dav/DavExchangeSession.java
View File

@ -1982,7 +1982,7 @@ public class DavExchangeSession extends ExchangeSession {
try { try {
reader = XMLStreamUtil.createXMLStreamReader(roamingdictionary); reader = XMLStreamUtil.createXMLStreamReader(roamingdictionary);
while (reader.hasNext()) { while (reader.hasNext()) {
reader.nextTag(); reader.next();
if (XMLStreamUtil.isStartTag(reader, "e") if (XMLStreamUtil.isStartTag(reader, "e")
&& "18-timezone".equals( XMLStreamUtil.getAttributeValue(reader, "k"))) { && "18-timezone".equals( XMLStreamUtil.getAttributeValue(reader, "k"))) {
String value = XMLStreamUtil.getAttributeValue(reader, "v"); String value = XMLStreamUtil.getAttributeValue(reader, "v");

2
src/java/davmail/exchange/dav/ExchangePropPatchMethod.java
View File

@ -195,7 +195,7 @@ public class ExchangePropPatchMethod extends PostMethod {
}); });
while (reader.hasNext()) { while (reader.hasNext()) {
reader.nextTag(); reader.next();
if (XMLStreamUtil.isStartTag(reader, "response")) { if (XMLStreamUtil.isStartTag(reader, "response")) {
handleResponse(reader); handleResponse(reader);
} }

2
src/java/davmail/exchange/ews/EWSMethod.java
View File

@ -808,7 +808,7 @@ public abstract class EWSMethod extends PostMethod {
try { try {
reader = XMLStreamUtil.createXMLStreamReader(getResponseBodyAsStream()); reader = XMLStreamUtil.createXMLStreamReader(getResponseBodyAsStream());
while (reader.hasNext()) { while (reader.hasNext()) {
reader.nextTag(); reader.next();
handleErrors(reader); handleErrors(reader);
if (serverVersion == null && XMLStreamUtil.isStartTag(reader, "ServerVersionInfo")) { if (serverVersion == null && XMLStreamUtil.isStartTag(reader, "ServerVersionInfo")) {
String majorVersion = getAttributeValue(reader, "MajorVersion"); String majorVersion = getAttributeValue(reader, "MajorVersion");

2
src/java/davmail/exchange/ews/ResolveNamesMethod.java
View File

@ -47,7 +47,7 @@ public class ResolveNamesMethod extends EWSMethod {
responseItem.type = "Contact"; responseItem.type = "Contact";
// skip to Contact // skip to Contact
while (reader.hasNext() && !XMLStreamUtil.isStartTag(reader, "Resolution")) { while (reader.hasNext() && !XMLStreamUtil.isStartTag(reader, "Resolution")) {
reader.nextTag(); reader.next();
} }
while (reader.hasNext() && !XMLStreamUtil.isEndTag(reader, "Resolution")) { while (reader.hasNext() && !XMLStreamUtil.isEndTag(reader, "Resolution")) {
reader.nextTag(); reader.nextTag();