Changeset 4175 for trunk/sources/HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs

Timestamp:

08/06/10 16:59:13 (14 years ago)

Author:

epitzer

Message:

Properly copy serializers when initializing global configuration. (#1136)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs

@@ -94 +94 @@
       try {
         TryLoadSettings();
-      }
-      catch (Exception e) {
+      } catch (Exception e) {
         if (throwOnError) {
           throw new PersistenceException("Could not load persistence settings.", e);
@@ -162 +161 @@
           if (a != defaultAssembly)
             DiscoverFrom(a);
-      }
-      catch (AppDomainUnloadedException x) {
+      } catch (AppDomainUnloadedException x) {
         Logger.Warn("could not get list of assemblies, AppDomain has already been unloaded", x);
       }
@@ -207 +205 @@
           }
         }
-      }
-      catch (ReflectionTypeLoadException e) {
+      } catch (ReflectionTypeLoadException e) {
         Logger.Warn("could not analyse assembly: " + a.FullName, e);
       }
@@ -223 +220 @@
         foreach (IPrimitiveSerializer f in PrimitiveSerializers[format.SerialDataType]) {
           if (!primitiveConfig.ContainsKey(f.SourceType))
-            primitiveConfig.Add(f.SourceType, f);
+            primitiveConfig.Add(f.SourceType, (IPrimitiveSerializer)Activator.CreateInstance(f.GetType()));
         }
       } else {
@@ -234 +231 @@
         format,
         primitiveConfig.Values,
-        CompositeSerializers.Where((d) => d.Priority > 0));
+        CompositeSerializers.Where((d) => d.Priority > 0).Select(d => (ICompositeSerializer)Activator.CreateInstance(d.GetType())));
     }