Cleaning up CommandAssembler.

Author: Stefán J. Sigurðarson

projects/client/RabbitMQ.Client/src/client/impl/CommandAssembler.cs

@@ -77,51 +77,46 @@ public Command HandleFrame(InboundFrame f)
             switch (m_state)
             {
                 case AssemblyState.ExpectingMethod:
+                    if (!f.IsMethod())
                     {
-                        if (!f.IsMethod())
-                        {
-                            throw new UnexpectedFrameException(f);
-                        }
-                        m_method = m_protocol.DecodeMethodFrom(f.Payload.AsMemory(0, f.PayloadSize));
-                        m_state = m_method.HasContent
-                            ? AssemblyState.ExpectingContentHeader
-                            : AssemblyState.Complete;
-                        return CompletedCommand();
+                        throw new UnexpectedFrameException(f);
                     }
+                    m_method = m_protocol.DecodeMethodFrom(f.Payload.AsMemory(0, f.PayloadSize));
+                    m_state = m_method.HasContent ? AssemblyState.ExpectingContentHeader : AssemblyState.Complete;
+                    return CompletedCommand();
                 case AssemblyState.ExpectingContentHeader:
+                    if (!f.IsHeader())
                     {
-                        if (!f.IsHeader())
-                        {
-                            throw new UnexpectedFrameException(f);
-                        }
-                        Memory<byte> memory = f.Payload.AsMemory(0, f.PayloadSize);
-                        m_header = m_protocol.DecodeContentHeaderFrom(NetworkOrderDeserializer.ReadUInt16(memory));
-                        ulong totalBodyBytes = m_header.ReadFrom(memory.Slice(2));
-                        if (totalBodyBytes > MaxArrayOfBytesSize)
-                        {
-                            throw new UnexpectedFrameException(f);
-                        }
-                        m_remainingBodyBytes = (int)totalBodyBytes;
-                        m_body = new byte[m_remainingBodyBytes];
-                        m_bodyStream = new MemoryStream(m_body, true);
-                        UpdateContentBodyState();
-                        return CompletedCommand();
+                        throw new UnexpectedFrameException(f);
                     }
+                    Memory<byte> memory = f.Payload.AsMemory(0, f.PayloadSize);
+                    m_header = m_protocol.DecodeContentHeaderFrom(NetworkOrderDeserializer.ReadUInt16(memory));
+                    ulong totalBodyBytes = m_header.ReadFrom(memory.Slice(2));
+                    if (totalBodyBytes > MaxArrayOfBytesSize)
+                    {
+                        throw new UnexpectedFrameException(f);
+                    }
+
+                    m_remainingBodyBytes = (int)totalBodyBytes;
+                    m_body = new byte[m_remainingBodyBytes];
+                    m_bodyStream = new MemoryStream(m_body, true);
+                    UpdateContentBodyState();
+                    return CompletedCommand();
                 case AssemblyState.ExpectingContentBody:
+                    if (!f.IsBody())
                     {
-                        if (!f.IsBody())
-                        {
-                            throw new UnexpectedFrameException(f);
-                        }
-                        if (f.PayloadSize > m_remainingBodyBytes)
-                        {
-                            throw new MalformedFrameException($"Overlong content body received - {m_remainingBodyBytes} bytes remaining, {f.PayloadSize} bytes received");
-                        }
-                        m_bodyStream.Write(f.Payload, 0, f.PayloadSize);
-                        m_remainingBodyBytes -= f.PayloadSize;
-                        UpdateContentBodyState();
-                        return CompletedCommand();
+                        throw new UnexpectedFrameException(f);
                     }
+
+                    if (f.PayloadSize > m_remainingBodyBytes)
+                    {
+                        throw new MalformedFrameException($"Overlong content body received - {m_remainingBodyBytes} bytes remaining, {f.PayloadSize} bytes received");
+                    }
+
+                    m_bodyStream.Write(f.Payload, 0, f.PayloadSize);
+                    m_remainingBodyBytes -= f.PayloadSize;
+                    UpdateContentBodyState();
+                    return CompletedCommand();
                 case AssemblyState.Complete:
                 default:
                     return null;