Merge pull request #876 from BLasan/5.3.x

Handle: Socket Timeout Exception

Author: HeshanSudarshana

components/data-bridge/org.wso2.carbon.databridge.receiver.binary/src/main/java/org/wso2/carbon/databridge/receiver/binary/internal/BinaryDataReceiver.java

@@ -42,6 +42,7 @@
 import java.io.*;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
@@ -210,12 +211,23 @@ public BinarySecureEventServerAcceptor(ServerSocket serverSocket) {
         @Override
         public void run() {
             while (true) {
+                Socket socket = null;
                 try {
-                    Socket socket = this.serverSocket.accept();
+                    socket = this.serverSocket.accept();
                     socket.setSoTimeout(binaryDataReceiverConfiguration.getSocketTimeout());
                     sslReceiverExecutorService.submit(new BinaryTransportReceiver(socket));
+                } catch (SocketTimeoutException socketTimeoutException) {
+                    log.error("Socket read timed out for client", socketTimeoutException);
                 } catch (IOException e) {
                     log.error("Error while accepting the connection. ", e);
+                } finally {
+                    if (socket != null && !socket.isClosed()) {
+                        try {
+                            socket.close();
+                        } catch (IOException ex) {
+                            log.error("Error while closing socket", ex);
+                        }
+                    }
                 }
             }
         }
@@ -231,12 +243,23 @@ public BinaryEventServerAcceptor(ServerSocket serverSocket) {
         @Override
         public void run() {
             while (true) {
+                Socket socket = null;
                 try {
-                    Socket socket = this.serverSocket.accept();
+                    socket = this.serverSocket.accept();
                     socket.setSoTimeout(binaryDataReceiverConfiguration.getSocketTimeout());
                     tcpReceiverExecutorService.submit(new BinaryTransportReceiver(socket));
+                } catch (SocketTimeoutException socketTimeoutException) {
+                    log.error("Socket read timed out for client", socketTimeoutException);
                 } catch (IOException e) {
                     log.error("Error while accepting the connection. ", e);
+                } finally {
+                    if (socket != null && !socket.isClosed()) {
+                        try {
+                            socket.close();
+                        } catch (IOException ex) {
+                            log.error("Error while closing socket", ex);
+                        }
+                    }
                 }
             }
         }