Repository: spark Updated Branches: refs/heads/master 7afc8564f -> 4af5c7e24
[Minor] [Core] Don't NPE on closeQuietly(null) Author: Aaron Davidson <[email protected]> Closes #3166 from aarondav/closeQuietlyer and squashes the following commits: 78096b5 [Aaron Davidson] Don't NPE on closeQuietly(null) Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4af5c7e2 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4af5c7e2 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4af5c7e2 Branch: refs/heads/master Commit: 4af5c7e24455246c61c1f3c22225507e720d721d Parents: 7afc856 Author: Aaron Davidson <[email protected]> Authored: Sat Nov 8 13:03:51 2014 -0800 Committer: Reynold Xin <[email protected]> Committed: Sat Nov 8 13:03:51 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/4af5c7e2/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: [email protected] For additional commands, e-mail: [email protected]
