added arg validation to debug bridge issue and bumped version

hasankhan · Jan 31, 2015 · a820a51 · a820a51
1 parent 943037e
commit a820a51
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 13 deletions.
diff --git a/Shared/AssemblyInfo.Version.cs b/Shared/AssemblyInfo.Version.cs
@@ -2,4 +2,4 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("3.4.3.0")]
+[assembly: AssemblyVersion("3.4.4.0")]
diff --git a/Squiggle.Bridge/BridgeHost.cs b/Squiggle.Bridge/BridgeHost.cs
@@ -131,6 +131,8 @@ public void SendChatMessage(bool local, IPEndPoint target, Core.Chat.Transport.M
 
         public void SendPresenceMessage(IPEndPoint target, byte[] message)
         {
+            Validator.IsNotNull(target, "target");
+            Validator.IsNotNull(message, "message");
             Send(target, new ForwardPresenceMessage() { BridgeEndPoint = externalEndPoint, Message = message});
         }
 

diff --git a/Squiggle.Utilities/Net/Pipe/UnicastMessagePipe.cs b/Squiggle.Utilities/Net/Pipe/UnicastMessagePipe.cs
@@ -27,6 +27,8 @@ protected override NetMQSocket CreateListener()
 
         public void Send(IPEndPoint target, byte[] message)
         {
+            Validator.IsNotNull(target, "target");
+            Validator.IsNotNull(message, "message");
             Send(target.Address.ToString(), target.Port, message);
         }
 

diff --git a/Squiggle.Utilities/Serialization/SerializationHelper.cs b/Squiggle.Utilities/Serialization/SerializationHelper.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using ProtoBuf.Meta;
 using System.Runtime.Serialization;
+using System.Diagnostics;
 
 namespace Squiggle.Utilities.Serialization
 {
@@ -20,28 +21,28 @@ public static byte[] Serialize<T>(T item)
             var stream = new MemoryStream();
             ProtoBuf.Serializer.Serialize<T>(stream, item);
             return stream.ToArray();
-        }
-
-        public static T Deserialize<T>(byte[] data)
-        {
-            if (data == null)
-                throw new ArgumentNullException("data");
-
-            var stream = new MemoryStream(data);
-            T item = ProtoBuf.Serializer.Deserialize<T>(stream);
-            return item;
-        }
+        }        
 
         public static void Deserialize<T>(byte[] data, Action<T> onDeserialize, string entityName) where T:class
         {
             T obj = null;
             if (ExceptionMonster.EatTheException(() =>
             {
                 obj = SerializationHelper.Deserialize<T>(data);
-            }, "deserializing " + entityName))
+            }, "deserializing " + entityName + " of type " + typeof(T).Name))
             {
                 onDeserialize(obj);
             }
         }
+
+        static T Deserialize<T>(byte[] data)
+        {
+            if (data == null)
+                throw new ArgumentNullException("data");
+
+            var stream = new MemoryStream(data);
+            T item = ProtoBuf.Serializer.Deserialize<T>(stream);
+            return item;
+        }
     }
 }
diff --git a/Squiggle.Utilities/Squiggle.Utilities.csproj b/Squiggle.Utilities/Squiggle.Utilities.csproj
@@ -106,6 +106,7 @@
     <Compile Include="TimeExtensions.cs" />
     <Compile Include="Application\UserActivityMonitor.cs" />
     <Compile Include="Application\WinStartup.cs" />
+    <Compile Include="Validator.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

diff --git a/Squiggle.Utilities/Validator.cs b/Squiggle.Utilities/Validator.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace System
+{
+    public static class Validator
+    {
+        public static void IsNotNull(object value, string name)
+        {
+            if (value == null)
+                throw new ArgumentNullException(name);
+        }
+    }
+}