HADOOP-2558 fixes for build up on hudson

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@610978 13f79535-47bb-0310-9956-ffa450edef68

src/contrib/hbase/CHANGES.txt

@@ -109,7 +109,7 @@ Trunk (unreleased changes)
                (Bryan Duxbury via Stack)
    HADOOP-2530 Missing type in new hbase custom RPC serializer
    HADOOP-2490 Failure in nightly #346 (Added debugging of hudson failures).
-   HADOOP-2558 fixes for build up on hudson (part 1, part 2)
+   HADOOP-2558 fixes for build up on hudson (part 1, part 2, part 3)
    
   IMPROVEMENTS
    HADOOP-2401 Add convenience put method that takes writable

src/contrib/hbase/src/test/org/apache/hadoop/hbase/MultiRegionTable.java

@@ -139,8 +139,9 @@ public class MultiRegionTable extends HBaseTestCase {
         HRegionInfo.encodeRegionName(parent.getRegionName()));
     assertTrue(fs.exists(parentDir));
     LOG.info("Split happened. Parent is " + parent.getRegionName() +
-        " and daughters are " + splitA.getRegionName() + ", " +
-        splitB.getRegionName());
+        " and daughters are " +
+        ((splitA != null)? splitA.getRegionName(): "-") + ", " +
+        ((splitB != null)? splitB.getRegionName(): "-"));
     
     // Recalibrate will cause us to wait on new regions' deployment
     recalibrate(t, new Text(columnName), retries, waitTime);