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 cm...@apache.org on 2014/09/17 23:28:12 UTC
git commit: HDFS-7075. hadoop-fuse-dfs fails because it cannot find
JavaKeyStoreProvider$Factory. (cmccabe) (cherry picked from commit
f23024852502441fc259012664e444e5e51c604a)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 6cb8ed0d2 -> 0ad613c36
HDFS-7075. hadoop-fuse-dfs fails because it cannot find JavaKeyStoreProvider$Factory. (cmccabe)
(cherry picked from commit f23024852502441fc259012664e444e5e51c604a)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0ad613c3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0ad613c3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0ad613c3
Branch: refs/heads/branch-2
Commit: 0ad613c369bb7ee7f23c2294799483b9eff58b30
Parents: 6cb8ed0
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Wed Sep 17 14:27:32 2014 -0700
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Wed Sep 17 14:28:05 2014 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/crypto/key/KeyProviderFactory.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ad613c3/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 2153a59..e5a914e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -391,6 +391,9 @@ Release 2.6.0 - UNRELEASED
HDFS-6912. SharedFileDescriptorFactory should not allocate sparse files
(cmccabe)
+ HDFS-7075. hadoop-fuse-dfs fails because it cannot find
+ JavaKeyStoreProvider$Factory (cmccabe)
+
BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
HADOOP-10734. Implement high-performance secure random number sources.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ad613c3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderFactory.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderFactory.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderFactory.java
index cb63dcd..fd91284 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderFactory.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderFactory.java
@@ -46,7 +46,8 @@ public abstract class KeyProviderFactory {
) throws IOException;
private static final ServiceLoader<KeyProviderFactory> serviceLoader =
- ServiceLoader.load(KeyProviderFactory.class);
+ ServiceLoader.load(KeyProviderFactory.class,
+ KeyProviderFactory.class.getClassLoader());
// Iterate through the serviceLoader to avoid lazy loading.
// Lazy loading would require synchronization in concurrent use cases.