From 8d10e8bbd1e19adc7c70e1101dbb69c213c910dd Mon Sep 17 00:00:00 2001
From: fcolin
Date: Fri, 22 Aug 2008 16:44:01 +0000
Subject: optimisation for parsing same regular expression from multiple client
 using fxCop for code beauty fix bug on concurrent connect

---
 Ivy/IvyUDPStreamV4.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'Ivy/IvyUDPStreamV4.cs')

diff --git a/Ivy/IvyUDPStreamV4.cs b/Ivy/IvyUDPStreamV4.cs
index 4f0a8fc..4cd5cee 100644
--- a/Ivy/IvyUDPStreamV4.cs
+++ b/Ivy/IvyUDPStreamV4.cs
@@ -27,37 +27,37 @@ namespace IvyBus
          * message Format:
                 protocol_version, TCP server port , lenAppId, appId,  lenAppNameId, appName
          */
-        private ushort DeserializeShort()
+        private int DeserializeInt()
         {
-            return (ushort)IPAddress.NetworkToHostOrder((ushort)input.ReadUInt16());
+            return IPAddress.NetworkToHostOrder((short)input.ReadInt16());
         }
         private string DeserializeString()
         {
             string arg;
             int val_len;
             char[] data;
-            val_len = (ushort)IPAddress.NetworkToHostOrder((ushort)input.ReadUInt16());
+            val_len = DeserializeInt();
             if (val_len != 0)
             {
                 data = input.ReadChars(val_len);
                 arg = new String(data);
             }
             else
-                arg = "";
+                arg = string.Empty;
             return arg;
         }
 
-        internal override void Deserialize(out ushort version, out ushort port, out string appId, out string appName)
+        internal override void Deserialize(out int version, out int port, out string appId, out string appName)
         {
-            version = DeserializeShort();
-            port = DeserializeShort();
+            version = DeserializeInt();
+            port = DeserializeInt();
             appId = DeserializeString();
             appName = DeserializeString();
 
         }
-        private void Serialize(ushort arg)
+        private void Serialize(int arg)
         {
-            output.Write((ushort)IPAddress.HostToNetworkOrder(arg));
+            output.Write((short)IPAddress.HostToNetworkOrder(arg));
         }
         private void Serialize(string arg)
         {
@@ -67,7 +67,7 @@ namespace IvyBus
                 output.Write(arg.ToCharArray());
         }
 
-        internal override void Serialize(ushort port, string appId, string appName)
+        internal override void Serialize(int port, string appId, string appName)
         {
             Serialize(PROCOCOLVERSION );
             Serialize(port);
-- 
cgit v1.1