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

Timestamp:

11/06/10 01:56:04 (13 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/EvaluationTCPChannel.cs (modified) (5 diffs)

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

@@ -58 +58 @@
     private Socket socket;
 
+    [StorableConstructor]
+    protected EvaluationTCPChannel(bool deserializing) : base(deserializing) { }
+    protected EvaluationTCPChannel(EvaluationTCPChannel original, Cloner cloner)
+      : base(original, cloner) {
+      ipAddress = original.ipAddress;
+      port = original.port;
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new EvaluationTCPChannel(this, cloner);
+    }
+
     public EvaluationTCPChannel() : this(String.Empty, 0) { }
     public EvaluationTCPChannel(string ip, int port)
@@ -63 +74 @@
       this.ipAddress = ip;
       this.port = port;
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      EvaluationTCPChannel clone = (EvaluationTCPChannel)base.Clone(cloner);
-      clone.ipAddress = ipAddress;
-      clone.port = port;
-      return clone;
     }
 
@@ -87 +91 @@
         byte[] buffer = EncodeDelimited(message);
         socket.Send(buffer);
-      } catch (SocketException) {
-        Close();
-        throw;
-      } catch (ObjectDisposedException) {
+      }
+      catch (SocketException) {
+        Close();
+        throw;
+      }
+      catch (ObjectDisposedException) {
         socket = null;
         Close();
@@ -122 +128 @@
         byte[] buffer = GetMessageBuffer();
         return builder.WeakMergeFrom(ByteString.CopyFrom(buffer)).WeakBuild();
-      } catch (SocketException) {
-        Close();
-        throw;
-      } catch (ObjectDisposedException) {
+      }
+      catch (SocketException) {
+        Close();
+        throw;
+      }
+      catch (ObjectDisposedException) {
         socket = null;
         Close();
@@ -164 +172 @@
             socket.Disconnect(false);
           socket.Close();
-        } catch { }
+        }
+        catch { }
         socket = null;
       }