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

HBASE-1374 NPE out of ZooKeeperWrapper.loadZooKeeperConfig 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@771996 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Kyle Purtell 2009-05-05 22:35:16 +00:00
parent 1a2a1764ad
commit 92e5efdcb6
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -109,6 +109,7 @@ Release 0.20.0 - Unreleased
HBASE-1368 HBASE-1279 broke the build HBASE-1368 HBASE-1279 broke the build
HBASE-1264 Wrong return values of comparators for ColumnValueFilter HBASE-1264 Wrong return values of comparators for ColumnValueFilter
(Thomas Schneider via Andrew Purtell) (Thomas Schneider via Andrew Purtell)
HBASE-1374 NPE out of ZooKeeperWrapper.loadZooKeeperConfig
IMPROVEMENTS IMPROVEMENTS
HBASE-1089 Add count of regions on filesystem to master UI; add percentage HBASE-1089 Add count of regions on filesystem to master UI; add percentage

3
src/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java
View File

@ -76,6 +76,9 @@ public class HQuorumPeer implements HConstants {
public static Properties parseZooKeeperConfig() throws IOException { public static Properties parseZooKeeperConfig() throws IOException {
ClassLoader cl = HQuorumPeer.class.getClassLoader(); ClassLoader cl = HQuorumPeer.class.getClassLoader();
InputStream inputStream = cl.getResourceAsStream(ZOOKEEPER_CONFIG_NAME); InputStream inputStream = cl.getResourceAsStream(ZOOKEEPER_CONFIG_NAME);
if (inputStream == null) {
throw new IOException(ZOOKEEPER_CONFIG_NAME + " not found");
}
return parseConfig(inputStream); return parseConfig(inputStream);
} }