You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by we...@apache.org on 2017/09/05 22:12:32 UTC
hadoop git commit: HADOOP-14688. Intern strings in KeyVersion and
EncryptedKeyVersion. Contributed by Xiao Chen.
Repository: hadoop
Updated Branches:
refs/heads/trunk ccd2ac60e -> ad32759fd
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/ad32759f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ad32759f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ad32759f
Branch: refs/heads/trunk
Commit: ad32759fd9f33e7bd18758ad1a5a464dab3bcbd9
Parents: ccd2ac6
Author: Wei-Chiu Chuang <we...@apache.org>
Authored: Tue Sep 5 15:11:37 2017 -0700
Committer: Wei-Chiu Chuang <we...@apache.org>
Committed: Tue Sep 5 15:11:37 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/ad32759f/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/ad32759f/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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org