[Monodevelop-patches-list] r2148 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Internal/Project

[commit-watcher at mono-cvs.ximian.com]

Author: lluis
Date: 2005-01-18 15:16:47 -0500 (Tue, 18 Jan 2005)
New Revision: 2148

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/CmbxFileFormat.cs
Log:
2005-01-18  Lluis Sanchez Gual  <lluis at novell.com>

	* Internal/Project/CmbxFileFormat.cs: Fix hang when the entry list
	is empty.



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-01-17 23:43:09 UTC (rev 2147)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-01-18 20:16:47 UTC (rev 2148)
@@ -1,3 +1,8 @@
+2005-01-18  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Internal/Project/CmbxFileFormat.cs: Fix hang when the entry list
+	is empty.
+
 2005-01-17  Todd Berman  <tberman at off.net>
 
 	* Gui/Pads/FileScout/FileList.cs: This is a ListStore, not a

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/CmbxFileFormat.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/CmbxFileFormat.cs	2005-01-17 23:43:09 UTC (rev 2147)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/CmbxFileFormat.cs	2005-01-18 20:16:47 UTC (rev 2148)
@@ -138,7 +138,7 @@
 		protected override DataNode ReadChild (XmlReader reader, DataItem parent)
 		{
 			if (reader.LocalName == "Entries") {
-				if (reader.IsEmptyElement) return null;
+				if (reader.IsEmptyElement) { reader.Skip(); return null; }
 				string basePath = Path.GetDirectoryName (file);
 				reader.ReadStartElement ();
 				while (MoveToNextElement (reader)) {
@@ -184,7 +184,7 @@
 		protected override DataNode ReadChild (XmlReader reader, DataItem parent)
 		{
 			if (reader.LocalName == "Entries") {
-				if (reader.IsEmptyElement) return null;
+				if (reader.IsEmptyElement) { reader.Skip(); return null; }
 				string basePath = Path.GetDirectoryName (combine.FileName);
 				reader.ReadStartElement ();
 				while (MoveToNextElement (reader)) {