[Libreoffice-commits] core.git: ridljar/com

[Noel Grandin (via logerrit)]

 ridljar/com/sun/star/lib/connections/socket/socketConnector.java |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit b6a26170b6145f7af057538f38fc656823726a0d
Author:     Noel Grandin <noel at peralex.com>
AuthorDate: Fri Sep 25 11:58:47 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Sep 25 17:56:33 2020 +0200

    socket cannot be null at this point
    
    Change-Id: I2027478d1dfa64a3841027d94d8eaa140fe319dd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103382
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/ridljar/com/sun/star/lib/connections/socket/socketConnector.java b/ridljar/com/sun/star/lib/connections/socket/socketConnector.java
index 484ffd135e92..c9a15d1f5d4a 100644
--- a/ridljar/com/sun/star/lib/connections/socket/socketConnector.java
+++ b/ridljar/com/sun/star/lib/connections/socket/socketConnector.java
@@ -158,11 +158,9 @@ public final class socketConnector implements XConnector {
 
             con = new SocketConnection(connectionDescription, socket);
         } catch (IOException e) {
-            if (socket != null) {
-                try {
-                    socket.close();
-                } catch(IOException ioException) {
-                }
+            try {
+                socket.close();
+            } catch(IOException ioException) {
             }
             throw new NoConnectException(e);
         }