Changeset 4722 for trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationProcessChannel.cs

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationProcessChannel.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationProcessChannel.cs

@@ -58 +58 @@
     private EvaluationStreamChannel streamingChannel;
 
+    [StorableConstructor]
+    protected EvaluationProcessChannel(bool deserializing) : base(deserializing) { }
+    protected EvaluationProcessChannel(EvaluationProcessChannel original, Cloner cloner)
+      : base(original, cloner) {
+      executable = original.executable;
+      arguments = original.arguments;
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new EvaluationProcessChannel(this, cloner);
+    }
+
     public EvaluationProcessChannel() : this(String.Empty, String.Empty) { }
     public EvaluationProcessChannel(string executable, string arguments)
@@ -63 +74 @@
       this.executable = executable;
       this.arguments = arguments;
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      EvaluationProcessChannel clone = (EvaluationProcessChannel)base.Clone(cloner);
-      clone.executable = executable;
-      clone.arguments = arguments;
-      return clone;
     }
 
@@ -96 +100 @@
       try {
         streamingChannel.Send(message);
-      } catch {
+      }
+      catch {
         Close();
         throw;
@@ -105 +110 @@
       try {
         return streamingChannel.Receive(builder);
-      } catch {
+      }
+      catch {
         Close();
         throw;
@@ -121 +127 @@
               process.WaitForExit(1000);
               process.Close();
-            } catch { }
+            }
+            catch { }
           }
           // for some reasons the event process_Exited does not fire