You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/06/26 05:21:43 UTC

svn commit: r1605657 - /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Closer.java

Author: ggregory
Date: Thu Jun 26 03:21:42 2014
New Revision: 1605657

URL: http://svn.apache.org/r1605657
Log:
Refactor to reuse own APIs, also give us shorter methods.

Modified:
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Closer.java

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Closer.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Closer.java?rev=1605657&r1=1605656&r2=1605657&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Closer.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Closer.java Thu Jun 26 03:21:42 2014
@@ -44,9 +44,7 @@ public final class Closer {
      */
     public static void closeSilently(final Closeable closeable) {
         try {
-            if (closeable != null) {
-                closeable.close();
-            }
+            close(closeable);
         } catch (final Exception ignored) {
             // ignored
         }
@@ -71,9 +69,7 @@ public final class Closer {
      */
     public static void closeSilently(final ServerSocket serverSocket) {
         try {
-            if (serverSocket != null) {
-                serverSocket.close();
-            }
+            close(serverSocket);
         } catch (final Exception ignored) {
             // ignored
         }
@@ -98,9 +94,7 @@ public final class Closer {
      */
     public static void closeSilently(final DatagramSocket datagramSocket) {
         try {
-            if (datagramSocket != null) {
-                datagramSocket.close();
-            }
+            close(datagramSocket);
         } catch (final Exception ignored) {
             // ignored
         }
@@ -126,9 +120,7 @@ public final class Closer {
      */
     public static void closeSilently(final Statement statement) {
         try {
-            if (statement != null) {
-                statement.close();
-            }
+            close(statement);
         } catch (final Exception ignored) {
             // ignored
         }
@@ -154,9 +146,7 @@ public final class Closer {
      */
     public static void closeSilently(final Connection connection) {
         try {
-            if (connection != null) {
-                connection.close();
-            }
+            close(connection);
         } catch (final Exception ignored) {
             // ignored
         }