Context Navigation

-                      r7259
+                      r8331
     #endregion
     #region IExternalEvaluationChannel Members
 …
         byte[] buffer = EncodeDelimited(message);
         socket.Send(buffer);
+      }
+      catch (SocketException) {
+        Close();
+        throw;
+      }
+      catch (ObjectDisposedException) {
+      } catch (SocketException) {
+        Close();
+        throw;
+      } catch (ObjectDisposedException) {
         socket = null;
         Close();
 …
+    }
     public override IMessage Receive(IBuilder builder) {
+    public override IMessage Receive(IBuilder builder, ExtensionRegistry extensions) {
       try {
         byte[] buffer = GetMessageBuffer();
+        return builder.WeakMergeFrom(ByteString.CopyFrom(buffer)).WeakBuild();
+      }
+      catch (SocketException) {
+        Close();
+        throw;
+      }
+      catch (ObjectDisposedException) {
+        return builder.WeakMergeFrom(ByteString.CopyFrom(buffer), extensions).WeakBuild();
+      } catch (SocketException) {
+        Close();
+        throw;
+      } catch (ObjectDisposedException) {
         socket = null;
         Close();
 …
             socket.Disconnect(false);
           socket.Close();
+        }
+        catch { }
+        } catch { }
         socket = null;
+      }

Note: See TracChangeset for help on using the changeset viewer.

Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationTCPChannel.cs