Changeset 9321

Timestamp:

03/20/13 10:34:28 (12 years ago)

Author:

svonolfe

Message:

Fixed possible race condition (#1953)

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -37 +37 @@
     IVRPEvaluator moveEvaluator;
 
+    private object locker = new object();
+
     public IVRPEvaluator MoveEvaluator {
       get {
-        if (evaluator == null)
-          return null;
-        else {
-          if (moveEvaluator == null) {
-            moveEvaluator = evaluator.Clone() as IVRPEvaluator;
-
-            foreach (IParameter parameter in moveEvaluator.Parameters) {
-              if (parameter is ILookupParameter
-                && parameter != moveEvaluator.ProblemInstanceParameter
-                && parameter != moveEvaluator.VRPToursParameter) {
-                (parameter as ILookupParameter).ActualName =
-                  VRPMoveEvaluator.MovePrefix +
-                  (parameter as ILookupParameter).ActualName;
+        lock (locker) {
+          if (evaluator == null)
+            return null;
+          else {
+            if (moveEvaluator == null) {
+              moveEvaluator = evaluator.Clone() as IVRPEvaluator;
+
+              foreach (IParameter parameter in moveEvaluator.Parameters) {
+                if (parameter is ILookupParameter
+                  && parameter != moveEvaluator.ProblemInstanceParameter
+                  && parameter != moveEvaluator.VRPToursParameter) {
+                  (parameter as ILookupParameter).ActualName =
+                    VRPMoveEvaluator.MovePrefix +
+                    (parameter as ILookupParameter).ActualName;
+                }
               }
             }
+
+            return moveEvaluator;
           }
-
-          return moveEvaluator;
         }
       }
@@ -176 +180 @@
 
       set {
-        moveEvaluator = null;
-        evaluator = value;
-        EvalBestKnownSolution();
+        lock (locker) {
+          moveEvaluator = null;
+          evaluator = value;
+          EvalBestKnownSolution();
+        }
       }
     }