Author: stack
Date: Fri Oct 30 17:25:34 2009
New Revision: 831395
URL: http://svn.apache.org/viewvc?rev=831395&view=rev
Log:
HBASE-1946 Unhandled exception at regionserver (Dmitriy Lyfar via Stack)
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=831395&r1=831394&r2=831395&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Oct 30 17:25:34 2009
@@ -82,7 +82,8 @@
HBASE-1925 IllegalAccessError: Has not been initialized (getMaxSequenceId)
HBASE-1929 If hbase-default.xml is not in CP, zk session timeout is 10
secs!
HBASE-1927 Scanners not closed properly in certain circumstances
- HBASE-1934 NullPointerException in ClientScanner (Daniel Ploeg via Stack)
+ HBASE-1934 NullPointerException in ClientScanner (Andrew Purtell via Stack)
+ HBASE-1946 Unhandled exception at regionserver (Dmitriy Lyfar via Stack)
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=831395&r1=831394&r2=831395&view=diff
==============================================================================
---
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
(original)
+++
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Fri Oct 30 17:25:34 2009
@@ -439,7 +439,7 @@
// Send messages to the master IF this.msgInterval has elapsed OR if
// we have something to tell (and we didn't just fail sending master).
if ((now - lastMsg) >= msgInterval ||
- (outboundArray.length == 0 && !this.outboundMsgs.isEmpty())) {
+ ((outboundArray == null || outboundArray.length == 0) &&
!this.outboundMsgs.isEmpty())) {
try {
doMetrics();
MemoryUsage memory =
