commit 4714f6a85c8b6cda9956d247dc820da44134e402
author Maxim Muzafarov <mmuzaf@apache.org> Tue Aug 24 21:41:04 2021 +0300
committer GitHub <noreply@github.com> Tue Aug 24 21:41:04 2021 +0300
tree c3fff1c71bb307a8bacaf07ba796f83193d481ea
parent cc09f1329b0e781a460e51f6de0c9fda45098e01

IGNITE-15367 Fix unnecessary socket shutdown and close log output (#9353)

modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 947fa54..e06f11e 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -74,6 +74,7 @@
 import java.net.URLConnection;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
 import java.nio.channels.FileLock;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
@@ -244,6 +245,7 @@
 import org.apache.ignite.internal.util.typedef.P1;
 import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.LT;
 import org.apache.ignite.internal.util.typedef.internal.SB;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.internal.util.worker.GridWorker;
@@ -4236,22 +4238,29 @@
      * @param log Logger to log possible checked exception with (optional).
      */
     public static void close(@Nullable Socket sock, @Nullable IgniteLogger log) {
-        if (sock != null) {
-            try {
-                // Avoid tls 1.3 incompatibility https://bugs.openjdk.java.net/browse/JDK-8208526
-                sock.shutdownOutput();
-                sock.shutdownInput();
-            }
-            catch (Exception e) {
-                warn(log, "Failed to shutdown socket: " + e.getMessage(), e);
-            }
+        if (sock == null)
+            return;
 
-            try {
-                sock.close();
-            }
-            catch (Exception e) {
-                warn(log, "Failed to close socket: " + e.getMessage(), e);
-            }
+        try {
+            // Avoid tls 1.3 incompatibility https://bugs.openjdk.java.net/browse/JDK-8208526
+            sock.shutdownOutput();
+            sock.shutdownInput();
+        }
+        catch (ClosedChannelException | SocketException ex) {
+            LT.warn(log, "Failed to shutdown socket", ex);
+        }
+        catch (Exception e) {
+            warn(log, "Failed to shutdown socket: " + e.getMessage(), e);
+        }
+
+        try {
+            sock.close();
+        }
+        catch (ClosedChannelException | SocketException ex) {
+            LT.warn(log, "Failed to close socket", ex);
+        }
+        catch (Exception e) {
+            warn(log, "Failed to close socket: " + e.getMessage(), e);
         }
     }