From 329796cac58c45a6740a1e0b9308b2a90ec20763 Mon Sep 17 00:00:00 2001
From: jxiang <jxiang@unknown>
Date: Wed, 7 Nov 2012 16:20:43 +0000
Subject: [PATCH] HBASE-6958 TestAssignmentManager sometimes fails

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1406699 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/hadoop/hbase/master/TestAssignmentManager.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
index 683cd4d4615..7f3bc12ad7f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
@@ -863,8 +863,11 @@ public class TestAssignmentManager {
           gate.get());
       // need to change table state from disabling to disabled.
       assertTrue("Table should be disabled.",
-          am.getZKTable().isDisabledTable(REGIONINFO.getTableNameAsString()));      
+          am.getZKTable().isDisabledTable(REGIONINFO.getTableNameAsString()));
     } finally {
+      this.server.getConfiguration().setClass(
+        HConstants.HBASE_MASTER_LOADBALANCER_CLASS, DefaultLoadBalancer.class,
+        LoadBalancer.class);
       am.getZKTable().setEnabledTable(REGIONINFO.getTableNameAsString());
       am.shutdown();
     }