Repository: hbase Updated Branches: refs/heads/0.98 b18bc4b06 -> b39e158c3
HBASE-12108 | Setting classloader so that HBase resources resolve even when HBaseConfiguration is loaded from a different class loader Signed-off-by: stack <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b39e158c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b39e158c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b39e158c Branch: refs/heads/0.98 Commit: b39e158c3ffe237b415a68682e79c8262bcc48e8 Parents: b18bc4b Author: Aniket Bhatnagar <[email protected]> Authored: Tue Jan 13 11:02:24 2015 +0530 Committer: stack <[email protected]> Committed: Tue Feb 3 08:26:57 2015 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/HBaseConfiguration.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b39e158c/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java index 330f2ea..6716492 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java @@ -113,6 +113,10 @@ public class HBaseConfiguration extends Configuration { */ public static Configuration create() { Configuration conf = new Configuration(); + // In case HBaseConfiguration is loaded from a different classloader than + // Configuration, conf needs to be set with appropriate class loader to resolve + // HBase resources. + conf.setClassLoader(HBaseConfiguration.class.getClassLoader()); return addHbaseResources(conf); }
