Fix serialization verification problem with Akka.IO messages

src/core/Akka/Actor/ActorCell.cs

@@ -519,10 +519,16 @@ private Envelope SerializeAndDeserialize(Envelope envelope)
             if (unwrapped is INoSerializationVerificationNeeded)
                 return envelope;
 
-            if(unwrapped.GetType().Namespace?.StartsWith("System.Net.Sockets") ?? false)
-                return envelope;
+            object deserializedMsg;
+            try
+            {
+                deserializedMsg = SerializeAndDeserializePayload(unwrapped);
+            }
+            catch (Exception e)
+            {
+                throw new SerializationException($"Failed to serialize and deserialize payload object [{unwrapped.GetType()}]. Envelope: [{envelope}]", e);
+            }
 
-            var deserializedMsg = SerializeAndDeserializePayload(unwrapped);
             if (deadLetter != null)
                 return new Envelope(new DeadLetter(deserializedMsg, deadLetter.Sender, deadLetter.Recipient), envelope.Sender);
             return new Envelope(deserializedMsg, envelope.Sender);
@@ -544,10 +550,6 @@ private object SerializeAndDeserializePayload(object obj)
                 var manifest = Serialization.Serialization.ManifestFor(serializer, obj);
                 return _systemImpl.Serialization.Deserialize(bytes, serializer.Identifier, manifest);
             }
-            catch (Exception e)
-            {
-                throw new SerializationException($"Failed to serialize and deserialize payload object {obj.GetType()}", e);
-            }
             finally
             {
                 Serialization.Serialization.CurrentTransportInformation = oldInfo;

src/core/Akka/IO/TcpListener.cs

@@ -71,9 +71,9 @@ private IEnumerable<SocketAsyncEventArgs> Accept(int limit)
             {
                 var self = Self;
                 var saea = new SocketAsyncEventArgs();
-                saea.Completed += (s, e) => self.Tell(e);
+                saea.Completed += (s, e) => self.Tell(new SocketEvent(e));
                 if (!_socket.AcceptAsync(saea))
-                    Self.Tell(saea);
+                    Self.Tell(new SocketEvent(saea));
                 yield return saea;
             }
         }
@@ -85,34 +85,34 @@ protected override SupervisorStrategy SupervisorStrategy()
 
         protected override bool Receive(object message)
         {
-            if (message is SocketAsyncEventArgs)
+            switch (message)
             {
-                var saea = message as SocketAsyncEventArgs;
-                if (saea.SocketError == SocketError.Success)
-                    Context.ActorOf(Props.Create<TcpIncomingConnection>(_tcp, saea.AcceptSocket, _bind.Handler, _bind.Options, _bind.PullMode).WithDeploy(Deploy.Local));
-                saea.AcceptSocket = null;
+                case SocketEvent evt:
+                    var saea = evt.Args;
+                    if (saea.SocketError == SocketError.Success)
+                        Context.ActorOf(Props.Create<TcpIncomingConnection>(_tcp, saea.AcceptSocket, _bind.Handler, _bind.Options, _bind.PullMode).WithDeploy(Deploy.Local));
+                    saea.AcceptSocket = null;
 
-                if (!_socket.AcceptAsync(saea))
-                    Self.Tell(saea);
-                return true;
-            }
-            var resumeAccepting = message as Tcp.ResumeAccepting;
-            if (resumeAccepting != null)
-            {
-                _acceptLimit = resumeAccepting.BatchSize;
-                _saeas = Accept(_acceptLimit).ToArray();
-                return true;
-            }
-            if (message is Tcp.Unbind)
-            {
-                _log.Debug("Unbinding endpoint {0}", _bind.LocalAddress);
-                 _socket.Dispose();
-                Sender.Tell(Tcp.Unbound.Instance);
-                _log.Debug("Unbound endpoint {0}, stopping listener", _bind.LocalAddress);
-                Context.Stop(Self);
-                return true;
+                    if (!_socket.AcceptAsync(saea))
+                        Self.Tell(new SocketEvent(saea));
+                    return true;
+
+                case Tcp.ResumeAccepting resumeAccepting:
+                    _acceptLimit = resumeAccepting.BatchSize;
+                    _saeas = Accept(_acceptLimit).ToArray();
+                    return true;
+
+                case Tcp.Unbind _:
+                    _log.Debug("Unbinding endpoint {0}", _bind.LocalAddress);
+                    _socket.Dispose();
+                    Sender.Tell(Tcp.Unbound.Instance);
+                    _log.Debug("Unbound endpoint {0}, stopping listener", _bind.LocalAddress);
+                    Context.Stop(Self);
+                    return true;
+
+                default:
+                    return false;
             }
-            return false;
         }
 
         /// <summary>
@@ -130,5 +130,15 @@ protected override void PostStop()
                 _log.Debug("Error closing ServerSocketChannel: {0}", e);
             }
         }
+
+        private struct SocketEvent : INoSerializationVerificationNeeded
+        {
+            public SocketAsyncEventArgs Args;
+
+            public SocketEvent(SocketAsyncEventArgs args)
+            {
+                Args = args;
+            }
+        }
     }
 }