You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2013/10/29 06:31:07 UTC
svn commit: r1536591 -
/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Author: larsh
Date: Tue Oct 29 05:31:06 2013
New Revision: 1536591
URL: http://svn.apache.org/r1536591
Log:
HBASE-9847 HConnectionImplementation does not connect to new active master (rajeshbabu)
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1536591&r1=1536590&r2=1536591&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Tue Oct 29 05:31:06 2013
@@ -1972,28 +1972,19 @@ public class HConnectionManager {
}
public HTableDescriptor[] listTables() throws IOException {
- if (this.master == null) {
- this.master = getMaster();
- }
- HTableDescriptor[] htd = master.getHTableDescriptors();
+ HTableDescriptor[] htd = getMaster().getHTableDescriptors();
return htd;
}
public HTableDescriptor[] getHTableDescriptors(List<String> tableNames) throws IOException {
if (tableNames == null || tableNames.isEmpty()) return new HTableDescriptor[0];
if (tableNames == null || tableNames.size() == 0) return null;
- if (this.master == null) {
- this.master = getMaster();
- }
- return master.getHTableDescriptors(tableNames);
+ return getMaster().getHTableDescriptors(tableNames);
}
@Override
public String[] getTableNames() throws IOException {
- if (this.master == null) {
- this.master = getMaster();
- }
- return master.getTableNames();
+ return getMaster().getTableNames();
}
public HTableDescriptor getHTableDescriptor(final byte[] tableName)
@@ -2007,10 +1998,7 @@ public class HConnectionManager {
}
List<String> tableNameList = new ArrayList<String>(1);
tableNameList.add(Bytes.toString(tableName));
- if (this.master == null) {
- this.master = getMaster();
- }
- HTableDescriptor[] htds = master.getHTableDescriptors(tableNameList);
+ HTableDescriptor[] htds = getHTableDescriptors(tableNameList);
if (htds != null && htds.length > 0) {
return htds[0];
}