Changeset 6029 for trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization

Timestamp:

04/19/11 13:30:38 (14 years ago)

Author:

mkommend

Message:

#1488: Added lock around critical region in cloning ctor of OperatorShapeInfo.

File:

• trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs

@@ -32 +32 @@
     [Storable]
     private List<string> labels;
+
+    private object lockObject = new object();
 
     [StorableConstructor]
@@ -42 +44 @@
       lineWidth = original.lineWidth;
       title = original.title;
-      if (original.icon != null) icon = (Bitmap)original.icon.Clone();
+
+      //mkommend: necessary because cloning a Bitmap is not threadsafe
+      //see http://stackoverflow.com/questions/1851292/invalidoperationexception-object-is-currently-in-use-elsewhere for further information
+      if (original.icon != null) {
+        lock (lockObject) {
+          icon = (Bitmap)original.icon.Clone();
+        }
+      }
 
       connectorNames = new List<string>(original.connectorNames);
@@ -231 +240 @@
       this.Icon = operatorShape.Icon;
       this.Collapsed = operatorShape.Collapsed;
-
-      //TODO update Connector and labels;
     }
   }