You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by ap...@apache.org on 2014/02/18 19:49:04 UTC

svn commit: r1569471 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Author: apurtell
Date: Tue Feb 18 18:49:03 2014
New Revision: 1569471

URL: http://svn.apache.org/r1569471
Log:
HBASE-10539. HRegion.addAndGetGlobalMemstoreSize returns previous size (Feng Honghua)

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1569471&r1=1569470&r2=1569471&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Tue Feb 18 18:49:03 2014
@@ -836,7 +836,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 */