HADOOP-14688. Intern strings in KeyVersion and EncryptedKeyVersion. Contributed by Xiao Chen.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/89ec91cb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/89ec91cb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/89ec91cb Branch: refs/heads/HDFS-7240 Commit: 89ec91cb004ff36b3b7f327167cb3b45b8baadd2 Parents: 86abf48 Author: Wei-Chiu Chuang <weic...@apache.org> Authored: Tue Sep 5 15:11:37 2017 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Wed Sep 6 12:14:48 2017 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java | 4 ++-- .../apache/hadoop/crypto/key/KeyProviderCryptoExtension.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/89ec91cb/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java index fb3dba4..c1c371b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java @@ -71,8 +71,8 @@ public abstract class KeyProvider { protected KeyVersion(String name, String versionName, byte[] material) { - this.name = name; - this.versionName = versionName; + this.name = name == null ? null : name.intern(); + this.versionName = versionName == null ? null : versionName.intern(); this.material = material; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/89ec91cb/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderCryptoExtension.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderCryptoExtension.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderCryptoExtension.java index 8c879b3..693c785 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderCryptoExtension.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderCryptoExtension.java @@ -81,8 +81,9 @@ public class KeyProviderCryptoExtension extends protected EncryptedKeyVersion(String keyName, String encryptionKeyVersionName, byte[] encryptedKeyIv, KeyVersion encryptedKeyVersion) { - this.encryptionKeyName = keyName; - this.encryptionKeyVersionName = encryptionKeyVersionName; + this.encryptionKeyName = keyName == null ? null : keyName.intern(); + this.encryptionKeyVersionName = encryptionKeyVersionName == null ? + null : encryptionKeyVersionName.intern(); this.encryptedKeyIv = encryptedKeyIv; this.encryptedKeyVersion = encryptedKeyVersion; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
