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

[stack]

Author: stack
Date: Thu Jun 23 04:04:29 2011
New Revision: 1138734

URL: http://svn.apache.org/viewvc?rev=1138734&view=rev
Log:
Fix failing TestHeapSize so it'll pass for 64bit and 32bit jvms

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

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1138734&r1=1138733&r2=1138734&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java 
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java 
Thu Jun 23 04:04:29 2011
@@ -3594,7 +3594,7 @@ public class HRegion implements HeapSize
   public static final long FIXED_OVERHEAD = ClassSize.align(
       ClassSize.OBJECT +
       ClassSize.ARRAY +
-      ClassSize.align(27 * ClassSize.REFERENCE) +
+      27 * ClassSize.REFERENCE +
       (4 * Bytes.SIZEOF_LONG) +
       Bytes.SIZEOF_BOOLEAN);