From 182d6595a66eca77d38adbe659c534854e8d4a22 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 7 Jan 2010 19:08:53 +0000
Subject: [PATCH] From Jean-Sebastien Guay, fix to handling of xml node with
 contents by not children

---
 src/osgDB/XmlParser.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/osgDB/XmlParser.cpp b/src/osgDB/XmlParser.cpp
index c97dc99f5..3af6c3ea2 100644
--- a/src/osgDB/XmlParser.cpp
+++ b/src/osgDB/XmlParser.cpp
@@ -295,7 +295,7 @@ bool XmlNode::read(Input& input)
                 }
             }
 
-            if ((c=input[0])>=0 && c=='>' || c=='/')
+            if ((c=input[0])>=0 && (c=='>' || c=='/'))
             {
                 ++input;
 
@@ -309,7 +309,7 @@ bool XmlNode::read(Input& input)
                         osg::notify(osg::INFO)<<"tag is closed correctly"<<std::endl;
                     }
                     else 
-                        osg::notify(osg::NOTICE)<<"Error: end tag is not closed correctly"<<std::endl;
+                        osg::notify(osg::NOTICE)<<"Error: tag is not closed correctly"<<std::endl;
                 }
                 else
                 {
@@ -401,7 +401,7 @@ bool XmlNode::write(std::ostream& fout) const
                 fout<<"\"";
             }
 
-            if (children.empty())
+            if (children.empty() && contents.empty())
             {
                 fout<<" />"<<std::endl;
             }