Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Core/Serializer.cs

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (2 props)
• HeuristicLab.Persistence (modified) (1 prop)
• HeuristicLab.Persistence/3.3/Core/Serializer.cs (modified) (5 diffs)

branches/PersistenceSpeedUp

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Core/Serializer.cs

@@ -210 +210 @@
         }
         ICompositeSerializer compositeSerializer = configuration.GetCompositeSerializer(type);
-        typeCache.SetSerializer(typeId, compositeSerializer.GetType());
-        if (compositeSerializer != null)
+        if (compositeSerializer != null) {
+          typeCache.SetSerializer(typeId, compositeSerializer.GetType());
           return CompositeEnumerator(
             name,
@@ -218 +218 @@
             typeId,
             compositeSerializer.CreateMetaInfo(value));
-        throw CreatePersistenceException(type, "Could not determine how to serialize a value.", null);
-      } catch (Exception x) {
+        }
+        throw CreatePersistenceException(type, "Could not determine how to serialize a value.", true);
+      }
+      catch (Exception x) {
         if (isTestRun) {
           exceptions.Add(x);
@@ -226 +228 @@
           throw;
         } else {
-          throw CreatePersistenceException(type, "Uncaught exception during serialization: ", x);
+          throw CreatePersistenceException(
+            type,
+            string.Format("Uncaught exception during serialization:{0}{1}", Environment.NewLine, x),
+            false);
         }
       } finally {
@@ -233 +238 @@
     }
 
-    private PersistenceException CreatePersistenceException(Type type, string message, Exception x) {
+    private PersistenceException CreatePersistenceException(Type type, string message, bool appendConfig) {
       StringBuilder sb = new StringBuilder();
       sb.Append(message)
@@ -240 +245 @@
         .AppendLine("\"")
         .Append("object graph location: ")
-        .AppendLine(string.Join(".", objectGraphTrace.ToArray()))
-        .AppendLine("No registered primitive serializer for this type:");
-      foreach (var ps in configuration.PrimitiveSerializers)
-        sb.Append(ps.SourceType.VersionInvariantName())
-          .Append(" ---- (")
-          .Append(ps.GetType().VersionInvariantName())
-          .AppendLine(")");
-      sb.AppendLine("Rejected by all composite serializers:");
-      foreach (var cs in configuration.CompositeSerializers)
-        sb.Append("\"")
-          .Append(cs.JustifyRejection(type))
-          .Append("\" ---- (")
-          .Append(cs.GetType().VersionInvariantName())
-          .AppendLine(")");
+        .AppendLine(string.Join(".", objectGraphTrace.ToArray()));
+      if (appendConfig) {
+        sb.AppendLine("No registered primitive serializer for this type:");
+        foreach (var ps in configuration.PrimitiveSerializers)
+          sb.Append(ps.SourceType.VersionInvariantName())
+            .Append(" ---- (")
+            .Append(ps.GetType().VersionInvariantName())
+            .AppendLine(")");
+        sb.AppendLine("Rejected by all composite serializers:");
+        foreach (var cs in configuration.CompositeSerializers)
+          sb.Append("\"")
+            .Append(cs.JustifyRejection(type))
+            .Append("\" ---- (")
+            .Append(cs.GetType().VersionInvariantName())
+            .AppendLine(")");
+      }
       return new PersistenceException(sb.ToString());
     }

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates