Commit 665dc693 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Fixed parsing of bodies with / chars. JM-983

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@7191 b35dd754-fafc-0310-a699-88a17e54d16e
parent 1a150de5
...@@ -195,7 +195,6 @@ class XMLLightweightParser { ...@@ -195,7 +195,6 @@ class XMLLightweightParser {
} else if (status == XMLLightweightParser.VERIFY_CLOSE_TAG) { } else if (status == XMLLightweightParser.VERIFY_CLOSE_TAG) {
if (ch == '>') { if (ch == '>') {
depth--; depth--;
}
if (depth < 1) { if (depth < 1) {
// Found a tag in the form <tag /> // Found a tag in the form <tag />
int end = buffer.length() - readByte + (i + 1); int end = buffer.length() - readByte + (i + 1);
...@@ -203,6 +202,10 @@ class XMLLightweightParser { ...@@ -203,6 +202,10 @@ class XMLLightweightParser {
// Add message to the list // Add message to the list
foundMsg(msg); foundMsg(msg);
startLastMsg = end; startLastMsg = end;
}
} else if (ch == '<') {
status = XMLLightweightParser.PRETAIL;
insideChildrenTag = true;
} else { } else {
status = XMLLightweightParser.INSIDE; status = XMLLightweightParser.INSIDE;
} }
...@@ -210,7 +213,6 @@ class XMLLightweightParser { ...@@ -210,7 +213,6 @@ class XMLLightweightParser {
if (ch == '"') { if (ch == '"') {
status = XMLLightweightParser.INSIDE; status = XMLLightweightParser.INSIDE;
continue;
} }
} else if (status == XMLLightweightParser.INSIDE_CDATA) { } else if (status == XMLLightweightParser.INSIDE_CDATA) {
if (ch == XMLLightweightParser.CDATA_END[cdataOffset]) { if (ch == XMLLightweightParser.CDATA_END[cdataOffset]) {
...@@ -218,7 +220,6 @@ class XMLLightweightParser { ...@@ -218,7 +220,6 @@ class XMLLightweightParser {
if (cdataOffset == XMLLightweightParser.CDATA_END.length) { if (cdataOffset == XMLLightweightParser.CDATA_END.length) {
status = XMLLightweightParser.INSIDE; status = XMLLightweightParser.INSIDE;
cdataOffset = 0; cdataOffset = 0;
continue;
} }
} else { } else {
cdataOffset = 0; cdataOffset = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment