am 95b32136: am 7700d858: Merge "Added Closeables.closeQuietly(Closeable) back"

* commit '95b321369ed8af3c5cf740313ad13ebdc1789541':
  Added Closeables.closeQuietly(Closeable) back

1 files changed, 26 insertions, 0 deletions

diff --git a/guava/src/com/google/common/io/Closeables.java b/guava/src/com/google/common/io/Closeables.java
index d6f618b32..f22e08e32 100644
--- a/guava/src/com/google/common/io/Closeables.java
+++ b/guava/src/com/google/common/io/Closeables.java
@@ -88,6 +88,32 @@ public final class Closeables {
   }
 
   /**
+   * Equivalent to calling {@code close(closeable, true)}, but with no IOException in the signature.
+   *
+   * @param closeable the {@code Closeable} object to be closed, or null, in which case this method
+   *     does nothing
+   * @deprecated Where possible, use the
+   *     <a href="http://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html">
+   *     try-with-resources</a> statement if using JDK7 or {@link Closer} on JDK6 to close one or
+   *     more {@code Closeable} objects. This method is deprecated because it is easy to misuse and
+   *     may swallow IO exceptions that really should be thrown and handled. See
+   *     <a href="https://code.google.com/p/guava-libraries/issues/detail?id=1118">Guava issue
+   *     1118</a> for a more detailed explanation of the reasons for deprecation and see
+   *     <a href="https://code.google.com/p/guava-libraries/wiki/ClosingResourcesExplained">
+   *     Closing Resources</a> for more information on the problems with closing {@code Closeable}
+   *     objects and some of the preferred solutions for handling it correctly. This method is
+   *     scheduled to be removed after upgrading Android to Guava 17.0.
+   */
+  @Deprecated
+  public static void closeQuietly(@Nullable Closeable closeable) {
+    try {
+      close(closeable, true);
+    } catch (IOException e) {
+      logger.log(Level.SEVERE, "IOException should not have been thrown.", e);
+    }
+  }
+
+  /**
    * Closes the given {@link InputStream}, logging any {@code IOException} that's thrown rather
    * than propagating it.
    *