Repository: hadoop Updated Branches: refs/heads/trunk d780a6786 -> ef8edab93
HADOOP-14523. OpensslAesCtrCryptoCodec.finalize() holds excessive amounts of memory. Contributed by Misha Dmitriev. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ef8edab9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ef8edab9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ef8edab9 Branch: refs/heads/trunk Commit: ef8edab930338646551cbe3c7e7cf954e21c0f9a Parents: d780a67 Author: Xiao Chen <[email protected]> Authored: Thu Jun 15 10:40:59 2017 -0700 Committer: Xiao Chen <[email protected]> Committed: Thu Jun 15 10:40:59 2017 -0700 ---------------------------------------------------------------------- .../apache/hadoop/crypto/OpensslAesCtrCryptoCodec.java | 11 ----------- .../org/apache/hadoop/crypto/random/OsSecureRandom.java | 5 +++++ 2 files changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ef8edab9/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslAesCtrCryptoCodec.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslAesCtrCryptoCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslAesCtrCryptoCodec.java index 63c382c..d0a12e9 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslAesCtrCryptoCodec.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslAesCtrCryptoCodec.java @@ -19,7 +19,6 @@ package org.apache.hadoop.crypto; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_SECURE_RANDOM_IMPL_KEY; -import java.io.Closeable; import java.io.IOException; import java.nio.ByteBuffer; import java.security.GeneralSecurityException; @@ -72,16 +71,6 @@ public class OpensslAesCtrCryptoCodec extends AesCtrCryptoCodec { } @Override - protected void finalize() throws Throwable { - try { - Closeable r = (Closeable) this.random; - r.close(); - } catch (ClassCastException e) { - } - super.finalize(); - } - - @Override public Configuration getConf() { return conf; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/ef8edab9/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/random/OsSecureRandom.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/random/OsSecureRandom.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/random/OsSecureRandom.java index 2010e6d..9428b98 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/random/OsSecureRandom.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/random/OsSecureRandom.java @@ -116,4 +116,9 @@ public class OsSecureRandom extends Random implements Closeable, Configurable { stream = null; } } + + @Override + protected void finalize() throws Throwable { + close(); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
