Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-14688. Intern strings in KeyVersion and EncryptedKeyVersion. Contributed by Xiao Chen.

Browse Source 
(cherry picked from commit ad32759fd9f33e7bd18758ad1a5a464dab3bcbd9)
(cherry picked from commit c16ecf0fe8c112437c463c8aabe3a4c0bce6d1da)
This commit is contained in:
Wei-Chiu Chuang 2017-09-05 15:11:37 -07:00
parent 3a2f3e78ff
commit aada99a376
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java
View File

@ -69,8 +69,8 @@ public static class KeyVersion {
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;
}

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderCryptoExtension.java
View File

@ -79,8 +79,9 @@ public static class EncryptedKeyVersion {
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;
}