svn commit: r1044520 - /hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java

[jdcryans]

Author: jdcryans
Date: Fri Dec 10 21:46:14 2010
New Revision: 1044520

URL: http://svn.apache.org/viewvc?rev=1044520&view=rev
Log:
HBASE-3308 Fix for TestHRegion

Modified:
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java?rev=1044520&r1=1044519&r2=1044520&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
 Fri Dec 10 21:46:14 2010
@@ -195,8 +195,6 @@ public class SplitTransaction {
       throw new IOException("Server is stopped or stopping");
     }
     assert !this.parent.lock.writeLock().isHeldByCurrentThread() : "Unsafe to 
hold write lock while performing RPCs";
-    this.fileSplitTimeout = server.getConfiguration().getLong(
-        "hbase.regionserver.fileSplitTimeout", this.fileSplitTimeout);
 
     // Coprocessor callback
     if (this.parent.getCoprocessorHost() != null) {
@@ -206,6 +204,9 @@ public class SplitTransaction {
     // If true, no cluster to write meta edits into.
     boolean testing = server == null? true:
       server.getConfiguration().getBoolean("hbase.testing.nocluster", false);
+    this.fileSplitTimeout = testing ? this.fileSplitTimeout :
+        server.getConfiguration().getLong(
+            "hbase.regionserver.fileSplitTimeout", this.fileSplitTimeout);
 
     createSplitDir(this.parent.getFilesystem(), this.splitdir);
     this.journal.add(JournalEntry.CREATE_SPLIT_DIR);