Changeset 2602 for trunk

Timestamp:

01/05/10 17:26:13 (15 years ago)

Author:

swagner

Message:

Improved error messages of ConfigMerger (#827)

Location:

trunk

Files:

• sources/ConfigMerger.exe (modified) (previous)
• tools/ConfigMerger/ConfigMerger.cs (modified) (3 diffs)

trunk/tools/ConfigMerger/ConfigMerger.cs

@@ -33 +33 @@
       }
       catch (Exception ex) {
-        Console.Out.WriteLine(ex.Message);
+        Console.Out.WriteLine(BuildErrorMessage(ex));
       }
     }
@@ -86 +86 @@
 
     private static void Merge(XmlNode source, XmlNode destination, XmlDocument document, string root) {
-      if (source != null) {
-        if (destination == null) {
-          XmlNode newNode = document.ImportNode(source, true);
-          document.SelectSingleNode(root).AppendChild(newNode);
-        } else {
-          foreach (XmlNode node in source.ChildNodes) {
-            XmlNode newNode = document.ImportNode(node, true);
-            XmlNode oldNode = destination.SelectSingleNode(BuildXPathString(newNode));
-            if (oldNode != null)
-              destination.ReplaceChild(newNode, oldNode);
-            else
-              destination.AppendChild(newNode);
+      try {
+        if (source != null) {
+          if (destination == null) {
+            XmlNode newNode = document.ImportNode(source, true);
+            document.SelectSingleNode(root).AppendChild(newNode);
+          } else {
+            foreach (XmlNode node in source.ChildNodes) {
+              XmlNode newNode = document.ImportNode(node, true);
+              XmlNode oldNode = destination.SelectSingleNode(BuildXPathString(newNode));
+              if (oldNode != null)
+                destination.ReplaceChild(newNode, oldNode);
+              else
+                destination.AppendChild(newNode);
+            }
           }
         }
+      }
+      catch (Exception ex) {
+        StringBuilder sb = new StringBuilder();
+        sb.Append("Error while merging node \"").Append(source.Name).Append("\"");
+        throw new Exception(sb.ToString(), ex);
       }
     }
@@ -118 +125 @@
       return builder.ToString();
     }
+
+    private static string BuildErrorMessage(Exception ex) {
+      StringBuilder sb = new StringBuilder();
+      sb.Append("\n\n");
+      sb.Append("### ConfigMerger ERROR ###########################################\n" + ex.Message + "\n" + ex.StackTrace + "\n");
+      while (ex.InnerException != null) {
+        ex = ex.InnerException;
+        sb.Append("-----\n" + ex.Message + "\n" + ex.StackTrace + "\n");
+      }
+      sb.Append("##################################################################\n\n");
+      return sb.ToString();
+    }
   }
 }