big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wei-Chiu Chuang 2017-09-05 15:11:37 -07:00
parent ccd2ac60ec
commit ad32759fd9
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

@ -71,8 +71,8 @@ public static class KeyVersion {
protected KeyVersion(String name, String versionName, protected KeyVersion(String name, String versionName,
byte[] material) { byte[] material) {
this.name = name; this.name = name == null ? null : name.intern();
this.versionName = versionName; this.versionName = versionName == null ? null : versionName.intern();
this.material = material; this.material = material;
} }

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

@ -81,8 +81,9 @@ public static class EncryptedKeyVersion {
protected EncryptedKeyVersion(String keyName, protected EncryptedKeyVersion(String keyName,
String encryptionKeyVersionName, byte[] encryptedKeyIv, String encryptionKeyVersionName, byte[] encryptedKeyIv,
KeyVersion encryptedKeyVersion) { KeyVersion encryptedKeyVersion) {
this.encryptionKeyName = keyName; this.encryptionKeyName = keyName == null ? null : keyName.intern();
this.encryptionKeyVersionName = encryptionKeyVersionName; this.encryptionKeyVersionName = encryptionKeyVersionName == null ?
null : encryptionKeyVersionName.intern();
this.encryptedKeyIv = encryptedKeyIv; this.encryptedKeyIv = encryptedKeyIv;
this.encryptedKeyVersion = encryptedKeyVersion; this.encryptedKeyVersion = encryptedKeyVersion;
} }