svn commit: r1587151 - /hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java

[larsh]

Author: larsh
Date: Mon Apr 14 05:10:46 2014
New Revision: 1587151

URL: http://svn.apache.org/r1587151
Log:
HBASE-10969 TestDistributedLogSplitting fails frequently in 0.94.

Modified:
    
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java

Modified: 
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java?rev=1587151&r1=1587150&r2=1587151&view=diff
==============================================================================
--- 
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
 (original)
+++ 
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
 Mon Apr 14 05:10:46 2014
@@ -122,10 +122,11 @@ public class TestDistributedLogSplitting
 
   @After
   public void after() throws Exception {
-    for (MasterThread mt : TEST_UTIL.getHBaseCluster().getLiveMasterThreads()) 
{
-      mt.getMaster().abort("closing...", new Exception("Trace info"));
+    if (TEST_UTIL.getHBaseCluster() != null) {
+      for (MasterThread mt : 
TEST_UTIL.getHBaseCluster().getLiveMasterThreads()) {
+        mt.getMaster().abort("closing...", new Exception("Trace info"));
+      }
     }
-
     TEST_UTIL.shutdownMiniCluster();
   }