Merge pull request #12 from mohrezaei/master

Add a stopAndTerminateConnections method to socket server.

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Change Log
+## 5.1.3 2022-07-24
+- for socket server, add a method to terminate ongoing connections (usually after stop)
+
 ## 5.1.2 2019-11-05
 - for socket server, fix url to service local map
 - for socket server, fix socket initial connection timeout

build/build.xml

@@ -165,7 +165,7 @@
         <tstamp>
             <format property="TIME_NOW" pattern="hh:mm:ss a z"/>
         </tstamp>
-        <echo message="JUnit master suite for jrpip starting at ${TIME_NOW} on ${TODAY} with ${test.threads} jvms."/>
+        <echo message="JUnit master suite for jrpip starting at ${TIME_NOW} on ${TODAY}."/>
         <echo message="Log4j file: ${root}/src/test/resources/log4j.properties"/>
         <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="${root}/target/testresult">
             <formatter type="xml" />

src/main/java/com/gs/jrpip/server/SocketServer.java

@@ -150,14 +150,21 @@ public void stop()
         }
     }
 
+    public void stopAndTerminateConnections()
+    {
+        this.stop();
+        this.terminateConnections();
+    }
+
     public void terminateConnections()
     {
         for (ServerSocketHandler ssh: this.hanlders.keySet())
         {
             try
             {
                 ssh.socket.close();
-            } catch (Exception ignore)
+            }
+            catch (Exception ignore)
             {
 
             }

src/test/java/com/gs/jrpip/SimpleSocketServiceTest.java

@@ -184,4 +184,23 @@ public void testServerRecycle() throws Exception
         Assert.assertTrue(end - now < 100);
 
     }
+
+    public void testTerminateServerSide() throws Exception
+    {
+        Echo echo = this.buildEchoProxy(100);
+
+        Assert.assertEquals("hello", echo.echo("hello"));
+
+        this.server.stopAndTerminateConnections();
+
+        try
+        {
+            echo.echo("hello");
+            Assert.fail("Must not get here");
+        }
+        catch(JrpipRuntimeException exception)
+        {
+            // expected
+        }
+    }
 }