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 2014/04/19 07:29:43 UTC
svn commit: r1588615 -
/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
Author: larsh
Date: Sat Apr 19 05:29:42 2014
New Revision: 1588615
URL: http://svn.apache.org/r1588615
Log:
HBASE-11030 HBaseTestingUtility.getMiniHBaseCluster should be able to return null.
Modified:
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1588615&r1=1588614&r2=1588615&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Sat Apr 19 05:29:42 2014
@@ -914,7 +914,7 @@ public class HBaseTestingUtility extends
* @see #startMiniCluster()
*/
public MiniHBaseCluster getMiniHBaseCluster() {
- if (this.hbaseCluster instanceof MiniHBaseCluster) {
+ if (this.hbaseCluster == null || this.hbaseCluster instanceof MiniHBaseCluster) {
return (MiniHBaseCluster)this.hbaseCluster;
}
throw new RuntimeException(hbaseCluster + " not an instance of " +