shutdown problem with TCP under Tomcat

[shark300]

This issue is copied from googlecode (Issue 71 in jdiameter: shutdown problem with TCP under Tomcat)

What steps will reproduce the problem?
1.Configure for TCP
2.Run as webapp under tomcat
3.shutdown tomcat.

What is the expected output? What do you see instead?
Tomcat is not able to stop due to org.jdiameter.server.impl.io.tcp.NetworkGuard's Executor (binder) which is never shuted down.

What version of the product are you using? On what operating system?
1.6.0.FINAL

Please provide any additional information below.
You should call binder.shutdown() in e.g. cleanTask.

Here is our patch:

--- "a/3parties\\JDiameter\\core\\jdiameter\\impl\\src\\main\\java\\org\\jdiameter\\server\\impl\\io\\tcp\\NetworkGuard.java"
+++ "b/3parties\\JDiameter\\core\\jdiameter\\impl\\src\\main\\java\\org\\jdiameter\\server\\impl\\io\\tcp\\NetworkGuard.java"
@@ -275,6 +275,9 @@ public class NetworkGuard implements INetworkGuard {
         }
         serverSocket = null;
       }
+      if (binder != null) {
+        binder.shutdown();
+      }
     }

     @Override

[deruelle]

Hi @shark300

Could you do a formal Pull Request following our Open Source guidelines ?

Thanks in advance !

[shark300]

Hi @deruelle

Ok.

[deruelle]

@shark300

Thanks. can you also sign the contributor license agreement at http://www.telestax.com/open-source/#Contribute so we can accept the contribution ?

[shark300]

@deruelle I sent to you an email.