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 2014/02/18 20:16:16 UTC
svn commit: r1569486 -
/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Author: stack
Date: Tue Feb 18 19:16:15 2014
New Revision: 1569486
URL: http://svn.apache.org/r1569486
Log:
HBASE-10539 HRegion.addAndGetGlobalMemstoreSize returns previous size
Modified:
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1569486&r1=1569485&r2=1569486&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Tue Feb 18 19:16:15 2014
@@ -803,7 +803,7 @@ public class HRegion implements HeapSize
if (this.rsAccounting != null) {
rsAccounting.addAndGetGlobalMemstoreSize(memStoreSize);
}
- return this.memstoreSize.getAndAdd(memStoreSize);
+ return this.memstoreSize.addAndGet(memStoreSize);
}
/** @return a HRegionInfo object for this region */