Check for empty elements to avoid NullReferenceException.

svn path=/trunk/mcs/; revision=22048

diff --git a/mcs/class/System.Data/System.Data/XmlDataLoader.cs b/mcs/class/System.Data/System.Data/XmlDataLoader.cs
index 6b9f3d526605e96507b5d79a8b3247e568fc8859..1afa8e4516f42055dcb7c209cc5aef4ab58b59fc 100644 (file)
--- a/mcs/class/System.Data/System.Data/XmlDataLoader.cs
+++ b/mcs/class/System.Data/System.Data/XmlDataLoader.cs
@@ -186,11 +186,16 @@ namespace System.Data
                                        
                                }
                                else { //Child node is a column.
+                                       object val = null;
+                                       if (childNode.FirstChild != null)
+                                               val = childNode.FirstChild.Value;
+                                       else
+                                               val = "";
                                        if (table.Columns.Contains(childNode.LocalName))
-                                               rowValue.Add(childNode.LocalName, childNode.FirstChild.Value);
+                                               rowValue.Add(childNode.LocalName, val);
                                        else if (inferSchema) {
                                                table.Columns.Add(childNode.LocalName);
-                                               rowValue.Add(childNode.LocalName, childNode.FirstChild.Value);
+                                               rowValue.Add(childNode.LocalName, val);
                                        }
                                }
                        }