[jbosscache-commits] JBoss Cache SVN: r6642 - core/trunk/src/main/java/org/jboss/cache.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2008-08-29 06:39:01 -0400 (Fri, 29 Aug 2008)
New Revision: 6642

Modified:
   core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java
Log:
fixed UT

Modified: core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java	2008-08-29 04:57:46 UTC (rev 6641)
+++ core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java	2008-08-29 10:39:01 UTC (rev 6642)
@@ -476,6 +476,17 @@
       return count;
    }
 
+   private int numAttributesMvcc(InternalNode n)
+   {
+      int count = 0;
+      for (Object child : n.getChildren())
+      {
+         count += numAttributesMvcc((InternalNode) child);
+      }
+      count += n.getData().size();
+      return count;
+   }
+
    private int numAttributes(InternalNode n)
    {
       int count = 0;
@@ -489,7 +500,7 @@
 
    public int getNumberOfAttributes()
    {
-      return usingMvcc ? numAttributes(rootInternal) : numAttributes(root);
+      return usingMvcc ? numAttributesMvcc(rootInternal) : numAttributes(root);
    }
 
    public boolean removeFromDataStructure(Fqn f, boolean skipMarkerCheck)