You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2009/10/30 18:21:42 UTC
svn commit: r831394 - in /hadoop/hbase/branches/0.20: CHANGES.txt
src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: stack
Date: Fri Oct 30 17:21:41 2009
New Revision: 831394
URL: http://svn.apache.org/viewvc?rev=831394&view=rev
Log:
HBASE-1946 Unhandled exception at regionserver (Dmitriy Lyfar via Stack)
Modified:
hadoop/hbase/branches/0.20/CHANGES.txt
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=831394&r1=831393&r2=831394&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Fri Oct 30 17:21:41 2009
@@ -20,7 +20,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-1899 Use scanner caching in shell count
Modified: hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=831394&r1=831393&r2=831394&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Fri Oct 30 17:21:41 2009
@@ -457,7 +457,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 =