Repository: spark Updated Branches: refs/heads/branch-1.2 fc51de339 -> 05bffcc02
[Minor] [Core] Don't NPE on closeQuietly(null) Author: Aaron Davidson <aa...@databricks.com> Closes #3166 from aarondav/closeQuietlyer and squashes the following commits: 78096b5 [Aaron Davidson] Don't NPE on closeQuietly(null) (cherry picked from commit 4af5c7e24455246c61c1f3c22225507e720d721d) Signed-off-by: Reynold Xin <r...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/05bffcc0 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/05bffcc0 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/05bffcc0 Branch: refs/heads/branch-1.2 Commit: 05bffcc023989fb09281e59cbc094f6990527c51 Parents: fc51de3 Author: Aaron Davidson <aa...@databricks.com> Authored: Sat Nov 8 13:03:51 2014 -0800 Committer: Reynold Xin <r...@databricks.com> Committed: Sat Nov 8 13:04:03 2014 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/spark/network/util/JavaUtils.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/05bffcc0/network/common/src/main/java/org/apache/spark/network/util/JavaUtils.java ---------------------------------------------------------------------- diff --git a/network/common/src/main/java/org/apache/spark/network/util/JavaUtils.java b/network/common/src/main/java/org/apache/spark/network/util/JavaUtils.java index 009dbcf..bf8a1fc 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/JavaUtils.java +++ b/network/common/src/main/java/org/apache/spark/network/util/JavaUtils.java @@ -44,7 +44,9 @@ public class JavaUtils { /** Closes the given object, ignoring IOExceptions. */ public static void closeQuietly(Closeable closeable) { try { - closeable.close(); + if (closeable != null) { + closeable.close(); + } } catch (IOException e) { logger.error("IOException should not have been thrown.", e); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
