fixed bug where connections were not closed

also added test cases for this
piksel · Oct 4, 2015 · cc6d963 · cc6d963
1 parent 29d1d8b
commit cc6d963
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 8 deletions.
diff --git a/NemesisTest/NemesisTest.csproj b/NemesisTest/NemesisTest.csproj
@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <AssemblyVersion>1.3.15258.125</AssemblyVersion>
+    <AssemblyVersion>1.3.15277.134</AssemblyVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/NemesisTest/Program.cs b/NemesisTest/Program.cs
@@ -51,14 +51,22 @@ static void Main(string[] args)
             Thread.Sleep(2000);
 
             var cmdTest = "test";
-            _log.Info("Sending command \"{0}\" to server A ({1})", cmdTest, serverGuidA);
+            _log.Info("Sending command \"{0}\" (1/2) to server A ({1})", cmdTest, serverGuidA);
             var response = client.SendCommand(cmdTest, serverGuidA);
             _log.Info("Got response: {0}", response.Result);
 
-            _log.Info("Sending command \"{0}\" from server A to client", cmdTest);
+            _log.Info("Sending command \"{0}\" (2/2) to server A ({1})", cmdTest, serverGuidA);
+            response = client.SendCommand(cmdTest, serverGuidA);
+            _log.Info("Got response: {0}", response.Result);
+
+            _log.Info("Sending command \"{0}\" (1/2) from server A to client", cmdTest);
             var response2 = serverA.SendCommand(cmdTest);
             _log.Info("Got response: {0}", response2.Result);
 
+            _log.Info("Sending command \"{0}\" (2/2) from server A to client", cmdTest);
+            response2 = serverA.SendCommand(cmdTest);
+            _log.Info("Got response: {0}", response2.Result);
+
 
             _log.Info("Sending command \"{0}\" to server B ({1})", cmdTest, serverGuidB);
             var response3 = client.SendCommand(cmdTest, serverGuidB);

diff --git a/NemesisTest/Properties/AssemblyInfo.cs b/NemesisTest/Properties/AssemblyInfo.cs
@@ -32,5 +32,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("1.3.15258.125")]
-[assembly: AssemblyFileVersion("1.3.15258.125")]
+[assembly: AssemblyVersion("1.3.15277.134")]
+[assembly: AssemblyFileVersion("1.3.15277.134")]
diff --git a/libnemesis/Client.cs b/libnemesis/Client.cs
@@ -108,6 +108,7 @@ private void HandleAsyncConnection(IAsyncResult result)
                             if (commandQueue.TryDequeue(out serverCommand))
                             {
                                 handleRemoteCommand(stream, serverCommand);
+                                stream.Close();
                             }
                             else
                             {
@@ -119,6 +120,7 @@ private void HandleAsyncConnection(IAsyncResult result)
                     {
                         _log.Info("Waiting for command...");
                         handleLocalCommand(stream, serverId);
+                        stream.Close();
                     }
                     else
                     {

diff --git a/libnemesis/Common.cs b/libnemesis/Common.cs
@@ -102,6 +102,7 @@ protected void handleRemoteCommand(NetworkStream stream, QueuedCommand serverCom
                 }
             }
             serverCommand.ResultSource.SetResult(response);
+            stream.Close();
         }
 
         protected async void handleLocalCommand(NetworkStream stream, Guid remoteId)

diff --git a/libnemesis/Properties/AssemblyInfo.cs b/libnemesis/Properties/AssemblyInfo.cs
@@ -32,5 +32,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("1.3.15258.110")]
-[assembly: AssemblyFileVersion("1.3.15258.110")]
+[assembly: AssemblyVersion("1.3.15277.116")]
+[assembly: AssemblyFileVersion("1.3.15277.116")]
diff --git a/libnemesis/libnemesis.csproj b/libnemesis/libnemesis.csproj
@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
-    <AssemblyVersion>1.3.15258.110</AssemblyVersion>
+    <AssemblyVersion>1.3.15277.116</AssemblyVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>