Merge pull request #879 from BLasan/test-branch-5.3.x

Fix: Socket Close Failure

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;
@@ -212,7 +213,6 @@ public void run() {
             while (true) {
                 try {
                     Socket socket = this.serverSocket.accept();
-                    socket.setSoTimeout(binaryDataReceiverConfiguration.getSocketTimeout());
                     sslReceiverExecutorService.submit(new BinaryTransportReceiver(socket));
                 } catch (IOException e) {
                     log.error("Error while accepting the connection. ", e);
@@ -233,7 +233,6 @@ public void run() {
             while (true) {
                 try {
                     Socket socket = this.serverSocket.accept();
-                    socket.setSoTimeout(binaryDataReceiverConfiguration.getSocketTimeout());
                     tcpReceiverExecutorService.submit(new BinaryTransportReceiver(socket));
                 } catch (IOException e) {
                     log.error("Error while accepting the connection. ", e);
@@ -252,6 +251,7 @@ public BinaryTransportReceiver(Socket socket) {
         @Override
         public void run() {
             try {
+                this.socket.setSoTimeout(binaryDataReceiverConfiguration.getSocketTimeout());
                 InputStream inputstream = new BufferedInputStream(socket.getInputStream());
                 OutputStream outputStream = new BufferedOutputStream((socket.getOutputStream()));
                 int messageType = inputstream.read();
@@ -261,8 +261,18 @@ public void run() {
                     processMessage(messageType, message, outputStream);
                     messageType = inputstream.read();
                 }
+            } catch (SocketTimeoutException socketTimeoutException) {
+                log.error("Socket read timed out for client", socketTimeoutException);
             } catch (IOException ex) {
                 log.error("Error while reading from the socket. ", ex);
+            } finally {
+                if (socket != null && !socket.isClosed()) {
+                    try {
+                        socket.close();
+                    } catch (IOException ex) {
+                        log.error("Error while closing socket", ex);
+                    }
+                }
             }
         }
     }