Changeset 1418 for branches

Timestamp:

03/25/09 17:15:42 (16 years ago)

Author:

epitzer

Message:

Don't crash if user configuration cannot be loaded. (#506)

Location:

branches/New Persistence Exploration/Persistence/Persistence/Core

Files:

• Configuration.cs (modified) (1 diff)
• ConfigurationService.cs (modified) (1 diff)

branches/New Persistence Exploration/Persistence/Persistence/Core/Configuration.cs

@@ -15 +15 @@
     public readonly IFormat Format;
 
-    private Configuration() {}
+    private Configuration() {
+      decomposerCache = new Dictionary<Type, IDecomposer>();
+    }
 
     public Configuration(Dictionary<Type, IFormatter> formatters, IEnumerable<IDecomposer> decomposers) {      

branches/New Persistence Exploration/Persistence/Persistence/Core/ConfigurationService.cs

@@ -35 +35 @@
 
     public void LoadSettings() {
-      if ( String.IsNullOrEmpty(Properties.Settings.Default.customConfigurations) ||
-        String.IsNullOrEmpty(Properties.Settings.Default.customConfigurationsTypeCache) )
-        return;
-      DeSerializer deSerializer = new DeSerializer(
-        XmlParser.ParseTypeCache(
-        new StringReader(
-          Properties.Settings.Default.customConfigurationsTypeCache)));
-      XmlParser parser = new XmlParser(
-        new StringReader(
-          Properties.Settings.Default.customConfigurations));
-      var newCustomConfigurations = (Dictionary<IFormat, Configuration>)
-        deSerializer.DeSerialize(parser);      
-      foreach ( var config in newCustomConfigurations ) {
-        customConfigurations[config.Key] = config.Value;
+      try {
+        if (String.IsNullOrEmpty(Properties.Settings.Default.customConfigurations) ||
+          String.IsNullOrEmpty(Properties.Settings.Default.customConfigurationsTypeCache))
+          return;
+        DeSerializer deSerializer = new DeSerializer(
+          XmlParser.ParseTypeCache(
+          new StringReader(
+            Properties.Settings.Default.customConfigurationsTypeCache)));
+        XmlParser parser = new XmlParser(
+          new StringReader(
+            Properties.Settings.Default.customConfigurations));
+        var newCustomConfigurations = (Dictionary<IFormat, Configuration>)
+          deSerializer.DeSerialize(parser);
+        foreach (var config in newCustomConfigurations) {
+          customConfigurations[config.Key] = config.Value;
+        }
+      } catch {
+        Console.WriteLine("WARNING: Could not load settings.");
       }
     }