Changeset 13203 for trunk/sources

Timestamp:

11/17/15 09:58:35 (9 years ago)

Author:

pfleck

Message:

#1674 Made CacheEntry thread-safe. Renamed the persistence properties for more clarity.

File:

• trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/EvaluationCache.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/EvaluationCache.cs

@@ -52 +52 @@
       private byte[] rawMessage;
 
+      private object lockObject = new object();
+
       public byte[] RawMessage {
         get { return rawMessage; }
         set {
-          rawMessage = value;
-          message = null;
+          lock (lockObject) {
+            rawMessage = value;
+            message = null;
+          }
         }
       }
@@ -65 +69 @@
 
       public QualityMessage GetMessage(ExtensionRegistry extensions) {
-        if (message == null && rawMessage != null)
-          message = QualityMessage.ParseFrom(ByteString.CopyFrom(rawMessage), extensions);
+        lock (lockObject) {
+          if (message == null && rawMessage != null)
+            message = QualityMessage.ParseFrom(ByteString.CopyFrom(rawMessage), extensions);
+        }
         return message;
       }
       public void SetMessage(QualityMessage value) {
-        message = value;
-        rawMessage = value.ToByteArray();
+        lock (lockObject) {
+          message = value;
+          rawMessage = value.ToByteArray();
+        }
       }
 
@@ -164 +172 @@
     #region BackwardsCompatibility3.4
     [Storable(Name = "Cache")]
-    private IEnumerable<KeyValuePair<string, double>> Cache_Persistence {
+    private IEnumerable<KeyValuePair<string, double>> Cache_Persistence_backwardscompatability {
       get { return Enumerable.Empty<KeyValuePair<string, double>>(); }
       set {
@@ -179 +187 @@
     #endregion
     [Storable(Name = "CacheNew")]
-    private IEnumerable<KeyValuePair<string, byte[]>> CacheNew_Persistence {
+    private IEnumerable<KeyValuePair<string, byte[]>> Cache_Persistence {
       get { return IsPersistent ? GetCacheValues() : Enumerable.Empty<KeyValuePair<string, byte[]>>(); }
       set { SetCacheValues(value); }