Fix: Close socket on shutdown

trifel · Feb 13, 2019 · 8133ce2 · 8133ce2
1 parent 8754d19
commit 8133ce2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/java/com/ictreport/ixi/api/Api.java b/src/main/java/com/ictreport/ixi/api/Api.java
@@ -36,6 +36,10 @@ public void init() {
 	public void shutDown() {
         receiver.shutDown();
         sender.shutDown();
+        try {
+            this.socket.close();
+        } catch (Exception e) {
+        }        
 	}
 
     public Receiver getReceiver() {

diff --git a/src/main/java/com/ictreport/ixi/api/Sender.java b/src/main/java/com/ictreport/ixi/api/Sender.java
@@ -109,7 +109,7 @@ public void send(final Payload payload, String host, final int port) {
     public synchronized void send(final Payload payload, final InetSocketAddress address) {
         try {
             final byte[] messageByteArray = Payload.serialize(payload).getBytes();
-            socket.send(new DatagramPacket(messageByteArray, messageByteArray.length, address));
+            if (socket != null && !socket.isClosed()) socket.send(new DatagramPacket(messageByteArray, messageByteArray.length, address));
         } catch (final IOException | RuntimeException e) {
             e.printStackTrace();
         }