Author: stack
Date: Thu Jan 10 17:19:06 2008
New Revision: 611005
URL: http://svn.apache.org/viewvc?rev=611005&view=rev
Log:
HADOOP-2558 fixes for build up on hudson
Part 5. Fix NPE in make multiregion.
Modified:
lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/MultiRegionTable.java
Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=611005&r1=611004&r2=611005&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Thu Jan 10 17:19:06 2008
@@ -109,7 +109,7 @@
(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, part 3)
+ HADOOP-2558 fixes for build up on hudson (part 1, part 2, part 3, part 4)
IMPROVEMENTS
HADOOP-2401 Add convenience put method that takes writable
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/MultiRegionTable.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/MultiRegionTable.java?rev=611005&r1=611004&r2=611005&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/MultiRegionTable.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/MultiRegionTable.java
Thu Jan 10 17:19:06 2008
@@ -306,8 +306,12 @@
* @throws IOException
*/
private static void compact(final MiniHBaseCluster cluster,
- final HRegionInfo r) throws IOException {
-
+ final HRegionInfo r)
+ throws IOException {
+ if (r == null) {
+ LOG.debug("Passed region is null");
+ return;
+ }
LOG.info("Starting compaction");
for (LocalHBaseCluster.RegionServerThread thread:
cluster.getRegionThreads()) {
