Merge pull request #31 from styxke/utf8_fix

Fixed a small bug in case the server responds with UT8 responses.

Author: dib0

src/Base/Net/SimpleMLLPClient.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Text;
 using System.IO;
+using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Net.Sockets;
 using System.Net.Security;
@@ -118,14 +120,18 @@ public string SendHL7Message(string message, double timeout = 30000)
             sw.Flush();
 
             // Read the reply
+            List<byte> buffer = new List<byte>();
             StringBuilder sb = new StringBuilder();
             bool messageComplete = false;
             DateTime startReadingTime = DateTime.Now;
             while (!messageComplete)
             {
                 int b = streamToUse.ReadByte();
                 if (b != -1)
-                    sb.Append((char) b);
+                {
+                    buffer.Add((byte)b);
+                    sb.Append((char)b);
+                }
 
                 messageComplete = MLLP.ValidateMLLPMessage(sb);
 
@@ -135,9 +141,8 @@ public string SendHL7Message(string message, double timeout = 30000)
                 if (!messageComplete && DateTime.Now.Subtract(startReadingTime).TotalMilliseconds > timeout)
                     throw new TimeoutException($"Reading the HL7 reply timed out after {timeout} milliseconds.");
             }
-            MLLP.StripMLLPContainer(sb);
-
-            return sb.ToString();
+            byte[] messageBytes = MLLP.StripMLLPContainer(buffer);
+            return (encodingForStream ?? Encoding.UTF8).GetString(messageBytes);
         }
 
         /// <summary>

src/Base/Util/MLLP.cs

@@ -1,4 +1,6 @@
-using System.Text;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
 
 namespace NHapiTools.Base.Util
 {
@@ -24,6 +26,12 @@ public static void StripMLLPContainer(StringBuilder sb)
             sb.Remove(0, 1);
             sb.Remove(sb.Length - 2, 2);
         }
+        
+        public static byte[] StripMLLPContainer(List<byte> bytes)
+        {
+            // Strip the message of the MLLP container characters
+            return bytes.Skip(1).Take(bytes.Count - 3).ToArray();
+        }
 
         /// <summary>
         /// Validate the MLLP message containing the HL7 message