Repository: hadoop Updated Branches: refs/heads/branch-2.7 3389bac42 -> 919cbc19e
HADOOP-9658. SnappyCodec#checkNativeCodeLoaded may unexpectedly fail when native code is not loaded. Contributed by Zhijie Shen. (cherry picked from commit 76fa606e2d3d04407f2f6b4ea276cce0f60db4be) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/919cbc19 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/919cbc19 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/919cbc19 Branch: refs/heads/branch-2.7 Commit: 919cbc19e94482f885c244dfd16acf1132560bcf Parents: 3389bac Author: Tsuyoshi Ozawa <oz...@apache.org> Authored: Mon May 4 17:05:00 2015 +0900 Committer: Tsuyoshi Ozawa <oz...@apache.org> Committed: Mon May 4 17:06:08 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/919cbc19/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 49168c7..b34adec 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -26,6 +26,9 @@ Release 2.7.1 - UNRELEASED HADOOP-11891. OsSecureRandom should lazily fill its reservoir (asuresh) + HADOOP-9658. SnappyCodec#checkNativeCodeLoaded may unexpectedly fail when + native code is not loaded. (Zhijie Shen via ozawa) + Release 2.7.0 - 2015-04-20 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/919cbc19/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java index 8d2fa1a..2a9c5d0 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java @@ -60,7 +60,8 @@ public class SnappyCodec implements Configurable, CompressionCodec, DirectDecomp * Are the native snappy libraries loaded & initialized? */ public static void checkNativeCodeLoaded() { - if (!NativeCodeLoader.buildSupportsSnappy()) { + if (!NativeCodeLoader.isNativeCodeLoaded() || + !NativeCodeLoader.buildSupportsSnappy()) { throw new RuntimeException("native snappy library not available: " + "this version of libhadoop was built without " + "snappy support.");
