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

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-03-04 06:14:01 -0500 (Wed, 04 Mar 2009)
New Revision: 7840

Modified:
   core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java
Log:
JBCACHE-1487

Modified: core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java	2009-03-04 10:14:23 UTC (rev 7839)
+++ core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java	2009-03-04 11:14:01 UTC (rev 7840)
@@ -409,10 +409,13 @@
          {
             return sb.toString();
          }
-         for (Object n : root.getChildrenDirect())
+         if (started && !usingMvcc)
          {
-            ((NodeSPI) n).print(sb, indent);
-            sb.append("\n");
+            for (Object n : root.getChildrenDirect())
+            {
+               ((NodeSPI) n).print(sb, indent);
+               sb.append("\n");
+            }
          }
       }
       return sb.toString();
@@ -420,11 +423,12 @@
 
    public int getNumberOfLocksHeld()
    {
-      return numLocks(root);
+         return started ? numLocks(root) : -1;
    }
 
    private int numLocks(NodeSPI n)
    {
+      if (!started) return 0;
       int num = 0;
       if (n != null)
       {
@@ -451,7 +455,7 @@
       }
       else
       {
-         return 0;
+         return -1;
       }
    }