Changeset 6618 for branches/GP.Grammar.Editor/HeuristicLab.Persistence

Timestamp:

08/01/11 17:48:53 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Persistence/3.3

Files:

• Core/Serializer.cs (modified) (4 diffs)
• Default/Xml/Primitive/System.Drawing/Bitmap2XmlSerializer.cs (modified) (1 diff)
• HeuristicLabPersistencePlugin.cs.frame (modified) (1 diff)
• Properties/AssemblyInfo.frame (modified) (1 diff)
• Tests/Properties/AssemblyInfo.cs (modified) (1 diff)
• Tests/UseCases.cs (modified) (1 diff)

branches/GP.Grammar.Editor/HeuristicLab.Persistence/3.3/Core/Serializer.cs

@@ -246 +246 @@
             compositeSerializer.CreateMetaInfo(value),
             emitTypeInfo);
-        throw CreatePersistenceException(type, "Could not determine how to serialize a value.");
+        throw CreatePersistenceException(type, "Could not determine how to serialize a value.", true);
       }
       catch (Exception x) {
@@ -255 +255 @@
           throw;
         } else {
-          throw CreatePersistenceException(type, "Uncaught exception during serialization: " + x.Message);
+          throw CreatePersistenceException(
+            type,
+            string.Format("Uncaught exception during serialization:{0}{1}", Environment.NewLine, x),
+            false);
         }
       }
@@ -261 +264 @@
         objectGraphTrace.Pop();
       }
-    }
-
-    private PersistenceException CreatePersistenceException(Type type, string message) {
+    }    
+
+    private PersistenceException CreatePersistenceException(Type type, string message, bool appendConfig) {
       StringBuilder sb = new StringBuilder();
       sb.Append(message)
@@ -270 +273 @@
         .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());
     }

branches/GP.Grammar.Editor/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/System.Drawing/Bitmap2XmlSerializer.cs

@@ -28 +28 @@
   internal sealed class Bitmap2XmlSerializer : PrimitiveXmlSerializerBase<Bitmap> {
 
-    public override XmlString Format(Bitmap o) {
+    public override XmlString Format(Bitmap o) {      
       MemoryStream stream = new MemoryStream();
-      o.Save(stream, ImageFormat.Png);
+      lock (o)
+        o.Save(stream, ImageFormat.Png);
       byte[] array = stream.ToArray();
       Byte1DArray2XmlSerializer serializer = new Byte1DArray2XmlSerializer();

branches/GP.Grammar.Editor/HeuristicLab.Persistence/3.3/HeuristicLabPersistencePlugin.cs.frame

@@ -27 +27 @@
   /// The plugin for HeuriticLab.Persistence
   /// </summary>
-  [Plugin("HeuristicLab.Persistence", "3.3.4.$WCREV$")]
+  [Plugin("HeuristicLab.Persistence", "3.3.5.$WCREV$")]
   [PluginFile("HeuristicLab.Persistence-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Tracing", "3.3")]

branches/GP.Grammar.Editor/HeuristicLab.Persistence/3.3/Properties/AssemblyInfo.frame

@@ -52 +52 @@
 //
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]

branches/GP.Grammar.Editor/HeuristicLab.Persistence/3.3/Tests/Properties/AssemblyInfo.cs

@@ -53 +53 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.3.0")]
+[assembly: AssemblyFileVersion("3.3.5.0")]

branches/GP.Grammar.Editor/HeuristicLab.Persistence/3.3/Tests/UseCases.cs

@@ -1289 +1289 @@
     }
 
+    [TestMethod]
+    public void ConcurrentBitmapTest() {
+      Bitmap b = new Bitmap(300, 300);
+      Random r = new Random();
+      for (int x = 0; x<b.Height; x++) {
+        for (int y = 0; y<b.Width; y++) {
+          b.SetPixel(x, y, Color.FromArgb(r.Next()));
+        }
+      }
+      Task[] tasks = new Task[20];
+      byte[][] datas = new byte[tasks.Length][];
+      for (int i = 0; i<tasks.Length; i++) {
+        tasks[i] = Task.Factory.StartNew((idx) => {
+          using (var stream = new MemoryStream()) {
+            XmlGenerator.Serialize(b, stream);
+            datas[(int)idx] = stream.ToArray();
+          }
+        }, i);
+      }
+      Task.WaitAll(tasks);
+    }
+
     [ClassInitialize]
     public static void Initialize(TestContext testContext) {