Fixed UnhandledExcaption after 20 hours #18

mattqs · mattqs · commit 0443ecb7b527 · 2014-12-17T06:40:43.000+11:00
diff --git a/Src/EngineIoClientDotNet.Tests.mono/ClientTests/ServerConnectionTest.cs b/Src/EngineIoClientDotNet.Tests.mono/ClientTests/ServerConnectionTest.cs
@@ -1,6 +1,8 @@
 ﻿
 
+using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Quobject.EngineIoClientDotNet.Client;
 using Quobject.EngineIoClientDotNet.Client.Transports;
 using Quobject.EngineIoClientDotNet.ComponentEmitter;
@@ -63,6 +65,7 @@ public void OpenAndClose()
         [Fact]
         public void Messages()
         {
+            LogManager.Enabled = true;
 
             var log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod());
             log.Info("Start");
@@ -446,6 +449,58 @@ public void UpgradeCookie()
         //    Assert.Equal("got cookie", result);
         //}
 
+
+       // [Fact]
+        //public void  MessagesMulti()
+        //{
+        //    LogManager.Enabled = true;
+
+        //    var log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod());
+        //    log.Info("Start");
+        //    _manualResetEvent = new ManualResetEvent(false);
+
+        //    var events = new ConcurrentQueue<string>();
+
+        //    int count = 200;
+
+        //    var socket = new Socket(CreateOptions());
+        //    socket.On(Socket.EVENT_OPEN, () =>
+        //    {
+        //        log.Info("EVENT_OPEN");
+
+        //        Task.Run(() =>
+        //        {
+        //            for (int i = 0; i < count; i++)
+        //            {
+        //                socket.Send("multi");
+        //                Task.Delay(TimeSpan.FromSeconds(1)).Wait();
+        //            }
+                    
+        //        });
+
+                
+        //    });
+        //    socket.On(Socket.EVENT_MESSAGE, (d) =>
+        //    {
+        //        var data = (string)d;
+        //        log.Info("EVENT_MESSAGE data = " + data);
+        //        events.Enqueue(data);
+        //        if (events.Count > count)
+        //        {
+        //            _manualResetEvent.Set();
+        //        }
+        //    });
+        //    socket.Open();
+        //    _manualResetEvent.WaitOne();
+        //    socket.Close();
+
+        //    string result;
+        //    events.TryDequeue(out result);
+        //    Assert.Equal("hi", result);
+        //    events.TryDequeue(out result);
+        //    Assert.Equal("multi", result);
+        //}
+
     }
 
 }
diff --git a/Src/EngineIoClientDotNet.Tests.net45/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.Tests.net45/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.12")]
-[assembly: AssemblyFileVersion("0.9.12")]
+[assembly: AssemblyVersion("0.9.14")]
+[assembly: AssemblyFileVersion("0.9.14")]
diff --git a/Src/EngineIoClientDotNet.mono/Client/Socket.cs b/Src/EngineIoClientDotNet.mono/Client/Socket.cs
@@ -390,10 +390,17 @@ internal void OnDrain()
 
             for (int i = 0; i < this.PrevBufferLen; i++)
             {
-                var callback = this.CallbackBuffer[i];
-                if (callback != null)
+                try
                 {
-                    callback();
+                    var callback = this.CallbackBuffer[i];
+                    if (callback != null)
+                    {
+                        callback();
+                    }
+                }
+                catch (ArgumentOutOfRangeException)
+                {
+                    //ignore
                 }
             }
             //log.Info(string.Format("OnDrain2 PrevBufferLen={0} WriteBuffer.Count={1}", PrevBufferLen, WriteBuffer.Count));
diff --git a/Src/EngineIoClientDotNet.mono/Client/Socket_net35.cs b/Src/EngineIoClientDotNet.mono/Client/Socket_net35.cs
@@ -391,10 +391,17 @@ internal void OnDrain()
            
             for (int i = 0; i < this.PrevBufferLen; i++)
             {
-                var callback = this.CallbackBuffer[i];
-                if (callback != null)
+                try
                 {
-                    callback();
+                    var callback = this.CallbackBuffer[i];
+                    if (callback != null)
+                    {
+                        callback();
+                    }
+                }
+                catch (ArgumentOutOfRangeException)
+                {
+                    //ignore
                 }
             }
 
diff --git a/Src/EngineIoClientDotNet.net35/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.net35/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.13")]
-[assembly: AssemblyFileVersion("0.9.13")]
+[assembly: AssemblyVersion("0.9.14")]
+[assembly: AssemblyFileVersion("0.9.14")]
diff --git a/Src/EngineIoClientDotNet.net45/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.net45/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.13")]
-[assembly: AssemblyFileVersion("0.9.13")]
+[assembly: AssemblyVersion("0.9.14")]
+[assembly: AssemblyFileVersion("0.9.14")]
diff --git a/Src/EngineIoClientDotNet.netcore45/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.netcore45/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.13")]
-[assembly: AssemblyFileVersion("0.9.13")]
+[assembly: AssemblyVersion("0.9.14")]
+[assembly: AssemblyFileVersion("0.9.14")]
diff --git a/Src/EngineIoClientDotNet.portable-win81+wpa81/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.portable-win81+wpa81/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.13")]
-[assembly: AssemblyFileVersion("0.9.13")]
+[assembly: AssemblyVersion("0.9.14")]
+[assembly: AssemblyFileVersion("0.9.14")]
diff --git a/Src/EngineIoClientDotNet.portable-wpa81+wp81/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.portable-wpa81+wp81/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.13")]
-[assembly: AssemblyFileVersion("0.9.13")]
+[assembly: AssemblyVersion("0.9.14")]
+[assembly: AssemblyFileVersion("0.9.14")]
diff --git a/Src/EngineIoClientDotNet.windowsphone8/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.windowsphone8/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.13")]
-[assembly: AssemblyFileVersion("0.9.13")]
+[assembly: AssemblyVersion("0.9.14")]
+[assembly: AssemblyFileVersion("0.9.14")]
diff --git a/TestServer/server.js b/TestServer/server.js
@@ -50,8 +50,16 @@ server.on('connection', function(socket){
   socket.send('hi');
 
 
+
+
   // Bounce any received messages back
   socket.on('message', function (data) {
+
+    console.log('got message1 data = "' + data + '"');
+    console.log('got message data stringify = "' + JSON.stringify(data) + '"');
+    var result = new Int8Array(data);
+    console.log('got message data Int8Array = "' + JSON.stringify(result) + '"\n\n');
+
     if (data === 'give binary') {
       var abv = new Int8Array(5);
       for (var i = 0; i < 5; i++) {
@@ -73,10 +81,6 @@ server.on('connection', function(socket){
       return;
     }
 
-    console.log('got message data = "' + data + '"');
-    console.log('got message data stringify = "' + JSON.stringify(data) + '"');
-    var result = new Int8Array(data);
-    console.log('got message data Int8Array = "' + JSON.stringify(result) + '"\n\n');
 
     socket.send(data);
 
@@ -85,6 +89,8 @@ server.on('connection', function(socket){
 });
 
 
+
+
 ssl_server.on('connection', function(socket){
   socket.send('hi');
 

Original file line number	Diff line number	Diff line change
`@@ -390,10 +390,17 @@ internal void OnDrain()`
`390`	`390`
`391`	`391`	`for (int i = 0; i < this.PrevBufferLen; i++)`
`392`	`392`	`{`
`393`		`- var callback = this.CallbackBuffer[i];`
`394`		`- if (callback != null)`
	`393`	`+ try`
`395`	`394`	`{`
`396`		`- callback();`
	`395`	`+ var callback = this.CallbackBuffer[i];`
	`396`	`+ if (callback != null)`
	`397`	`+ {`
	`398`	`+ callback();`
	`399`	`+ }`
	`400`	`+ }`
	`401`	`+ catch (ArgumentOutOfRangeException)`
	`402`	`+ {`
	`403`	`+ //ignore`
`397`	`404`	`}`
`398`	`405`	`}`
`399`	`406`	`//log.Info(string.Format("OnDrain2 PrevBufferLen={0} WriteBuffer.Count={1}", PrevBufferLen, WriteBuffer.Count));`
Original file line number	Diff line number	Diff line change
`@@ -391,10 +391,17 @@ internal void OnDrain()`
`391`	`391`
`392`	`392`	`for (int i = 0; i < this.PrevBufferLen; i++)`
`393`	`393`	`{`
`394`		`- var callback = this.CallbackBuffer[i];`
`395`		`- if (callback != null)`
	`394`	`+ try`
`396`	`395`	`{`
`397`		`- callback();`
	`396`	`+ var callback = this.CallbackBuffer[i];`
	`397`	`+ if (callback != null)`
	`398`	`+ {`
	`399`	`+ callback();`
	`400`	`+ }`
	`401`	`+ }`
	`402`	`+ catch (ArgumentOutOfRangeException)`
	`403`	`+ {`
	`404`	`+ //ignore`
`398`	`405`	`}`
`399`	`406`	`}`
`400`	`407`