ACCUMULO-2530 add TODO in code to reference ticket
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f3f54806 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f3f54806 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f3f54806 Branch: refs/heads/master Commit: f3f54806d8af1bb12da549260338977ffd370e5d Parents: f857e20 Author: Josh Elser <els...@apache.org> Authored: Tue Mar 25 16:30:11 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Tue Mar 25 16:30:11 2014 -0700 ---------------------------------------------------------------------- .../security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java | 3 ++- .../security/crypto/NonCachingSecretKeyEncryptionStrategy.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f3f54806/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java index d25d08c..e5ad13d 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java @@ -128,7 +128,8 @@ public class CachingHDFSSecretKeyEncryptionStrategy implements SecretKeyEncrypti if (pathToKeyName == null || pathToKeyName.equals("")) { pathToKeyName = Property.CRYPTO_DEFAULT_KEY_STRATEGY_KEY_LOCATION.getDefaultValue(); } - + + // TODO ACCUMULO-2530 Ensure volumes a properly supported Path pathToKey = new Path(pathToKeyName); FileSystem fs = FileSystem.get(CachedConfiguration.getInstance()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f3f54806/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java index efcec01..67278bf 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java @@ -153,6 +153,7 @@ public class NonCachingSecretKeyEncryptionStrategy implements SecretKeyEncryptio Path pathToKey = new Path(fullPath); try { + // TODO ACCUMULO-2530 Ensure volumes a properly supported FileSystem fs = FileSystem.get(CachedConfiguration.getInstance()); doKeyEncryptionOperation(Cipher.WRAP_MODE, params, fullPath, pathToKey, fs); @@ -176,6 +177,7 @@ public class NonCachingSecretKeyEncryptionStrategy implements SecretKeyEncryptio Path pathToKey = new Path(pathToKeyName); try { + // TODO ACCUMULO-2530 Ensure volumes a properly supported FileSystem fs = FileSystem.get(CachedConfiguration.getInstance()); doKeyEncryptionOperation(Cipher.UNWRAP_MODE, params, pathToKeyName, pathToKey, fs);
