CMIS-647: fixed issue with empty XML tags in AtomPub responses
git-svn-id: https://svn.apache.org/repos/asf/chemistry/dotcmis/trunk@1482775 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/DotCMIS/binding/atompub/atompub-parser.cs b/DotCMIS/binding/atompub/atompub-parser.cs
index 0a552bb..f3bcbf8 100644
--- a/DotCMIS/binding/atompub/atompub-parser.cs
+++ b/DotCMIS/binding/atompub/atompub-parser.cs
@@ -152,12 +152,12 @@
}
else
{
- skip(reader);
+ Skip(reader);
}
}
else
{
- skip(reader);
+ Skip(reader);
}
}
else if (reader.NodeType == XmlNodeType.EndElement)
@@ -234,7 +234,7 @@
}
}
- skip(reader);
+ Skip(reader);
return null;
}
@@ -262,12 +262,12 @@
}
else
{
- skip(reader);
+ Skip(reader);
}
}
else
{
- skip(reader);
+ Skip(reader);
}
}
else if (reader.NodeType == XmlNodeType.EndElement)
@@ -308,7 +308,7 @@
}
else
{
- skip(reader);
+ Skip(reader);
}
}
else if (reader.NodeType == XmlNodeType.EndElement)
@@ -352,7 +352,7 @@
reader.MoveToElement();
}
- skip(reader);
+ Skip(reader);
return new AtomElement(ns, ln, result);
}
@@ -378,7 +378,7 @@
}
else
{
- skip(reader);
+ Skip(reader);
}
}
else if (AtomPubConstants.NamespaceRestAtom == reader.NamespaceURI)
@@ -389,12 +389,12 @@
}
else
{
- skip(reader);
+ Skip(reader);
}
}
else
{
- skip(reader);
+ Skip(reader);
}
}
else if (reader.NodeType == XmlNodeType.EndElement)
@@ -507,7 +507,7 @@
}
}
- skip(reader);
+ Skip(reader);
return null;
}
@@ -529,7 +529,7 @@
}
else
{
- skip(reader);
+ Skip(reader);
}
}
else if (reader.NodeType == XmlNodeType.EndElement)
@@ -558,7 +558,7 @@
reader.MoveToElement();
}
- skip(reader);
+ Skip(reader);
return new AtomElement(reader.NamespaceURI, reader.LocalName, result);
}
@@ -621,7 +621,7 @@
return text;
}
- private void skip(XmlReader reader)
+ private void Skip(XmlReader reader)
{
if (!reader.IsEmptyElement)
{
@@ -630,7 +630,10 @@
{
if (reader.NodeType == XmlNodeType.Element)
{
- level++;
+ if (!reader.IsEmptyElement)
+ {
+ level++;
+ }
}
else if (reader.NodeType == XmlNodeType.EndElement)
{
