Changeset 6784 for branches/GP.Grammar.Editor/HeuristicLab.Core/3.3

Timestamp:

09/16/11 12:00:36 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

Location:

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

Files:

• Constraints/Constraint.cs (modified) (1 diff)
• ThreadSafeLog.cs (modified) (5 diffs)

branches/GP.Grammar.Editor/HeuristicLab.Core/3.3/Constraints/Constraint.cs

@@ -48 +48 @@
     protected Constraint() {
       this.Active = false;
-      if (AllowedConstraintOperations != null && AllowedConstraintOperations.Count() != 0)
+      if (AllowedConstraintOperations != null && AllowedConstraintOperations.Any())
         this.ConstraintOperation = AllowedConstraintOperations.ElementAt(0);
     }

branches/GP.Grammar.Editor/HeuristicLab.Core/3.3/ThreadSafeLog.cs

@@ -46 +46 @@
         try {
           return log.Messages.ToArray(); // return copy of messages
-        }
-        finally { locker.ExitReadLock(); }
+        } finally { locker.ExitReadLock(); }
       }
     }
@@ -72 +71 @@
       try {
         log = cloner.Clone(original.log);
-      }
-      finally { locker.ExitReadLock(); }
+      } finally { original.locker.ExitReadLock(); }
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -83 +81 @@
       try {
         log.Clear();
-      }
-      finally { locker.ExitWriteLock(); }
+      } finally { locker.ExitWriteLock(); }
     }
 
@@ -91 +88 @@
       try {
         log.LogMessage(message);
-      }
-      finally { locker.ExitWriteLock(); }
+      } finally { locker.ExitWriteLock(); }
     }
 
@@ -99 +95 @@
       try {
         log.LogException(ex);
-      }
-      finally { locker.ExitWriteLock(); }
+      } finally { locker.ExitWriteLock(); }
     }