From e542dac2a8f23520a93163721a9ae9dae98a16de Mon Sep 17 00:00:00 2001
From: larsh <larsh@unknown>
Date: Sat, 19 Apr 2014 05:28:47 +0000
Subject: [PATCH] HBASE-11030 HBaseTestingUtility.getMiniHBaseCluster should be
 able to return null.

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1588613 13f79535-47bb-0310-9956-ffa450edef68
---
 .../test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index 266967fea43..cc50cd2d51c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -932,7 +932,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
    * @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 " +