Merge pull request #877 from wso2/revert-876-5.3.x

Revert "Handle: Socket Timeout Exception"

Author: AnuGayan

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

@@ -42,7 +42,6 @@
 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;
@@ -211,23 +210,12 @@ public BinarySecureEventServerAcceptor(ServerSocket serverSocket) {
         @Override
         public void run() {
             while (true) {
-                Socket socket = null;
                 try {
-                    socket = this.serverSocket.accept();
+                    Socket 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);
-                        }
-                    }
                 }
             }
         }
@@ -243,23 +231,12 @@ public BinaryEventServerAcceptor(ServerSocket serverSocket) {
         @Override
         public void run() {
             while (true) {
-                Socket socket = null;
                 try {
-                    socket = this.serverSocket.accept();
+                    Socket 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);
-                        }
-                    }
                 }
             }
         }