[jbosscache-commits] JBoss Cache SVN: r5185 - in core/tags/1.4.1.SP9: src/org/jboss/cache/marshall and 1 other directories.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-01-22 05:48:02 -0500 (Tue, 22 Jan 2008)
New Revision: 5185

Removed:
   core/tags/1.4.1.SP9/tests/functional/org/jboss/cache/buddyreplication/RemoveRootBuddyTest.java
Modified:
   core/tags/1.4.1.SP9/src/org/jboss/cache/Node.java
   core/tags/1.4.1.SP9/src/org/jboss/cache/TreeCache.java
   core/tags/1.4.1.SP9/src/org/jboss/cache/marshall/JBCMethodCall.java
Log:
Reverted JBCACHE-1230 and JBCACHE-1241

Modified: core/tags/1.4.1.SP9/src/org/jboss/cache/Node.java
===================================================================
--- core/tags/1.4.1.SP9/src/org/jboss/cache/Node.java	2008-01-22 10:34:19 UTC (rev 5184)
+++ core/tags/1.4.1.SP9/src/org/jboss/cache/Node.java	2008-01-22 10:48:02 UTC (rev 5185)
@@ -446,37 +446,7 @@
       {
          if (data != null)
          {
-            if (trace)
-            {
-               sb.append("\ndata=").append(data.keySet());
-            }
-            else
-            {
-               sb.append("\ndata=[");
-               Set keys = data.keySet();
-               int i=0;
-               for (Iterator it = keys.iterator(); it.hasNext();)
-               {
-                  i++;
-                  sb.append(it.next());
-
-                  if (i == 5)
-                  {
-                     int more = keys.size() - 5;
-                     if (more > 1)
-                     {
-                        sb.append(", and ");
-                        sb.append(more);
-                        sb.append(" more");
-                        break;
-                     }
-                  }
-                  else
-                  {
-                     sb.append(", ");
-                  }
-               }
-            }
+            sb.append("\ndata=").append(data.keySet());
             sb.append("]");
          }
       }

Modified: core/tags/1.4.1.SP9/src/org/jboss/cache/TreeCache.java
===================================================================
--- core/tags/1.4.1.SP9/src/org/jboss/cache/TreeCache.java	2008-01-22 10:34:19 UTC (rev 5184)
+++ core/tags/1.4.1.SP9/src/org/jboss/cache/TreeCache.java	2008-01-22 10:48:02 UTC (rev 5185)
@@ -3887,7 +3887,7 @@
             for (Iterator i = children.iterator(); i.hasNext();)
             {
                Fqn childFqn = new Fqn(fqn, i.next());
-               if (!internalFqns.contains(childFqn)) remove(childFqn, o);
+               remove(childFqn, o);
             }
          }
       }
@@ -3919,7 +3919,7 @@
             for (Iterator i = children.iterator(); i.hasNext();)
             {
                Fqn childFqn = new Fqn(fqn, i.next());
-               if (!internalFqns.contains(childFqn)) evict(childFqn);
+               evict(childFqn);
             }
          }
       }

Modified: core/tags/1.4.1.SP9/src/org/jboss/cache/marshall/JBCMethodCall.java
===================================================================
--- core/tags/1.4.1.SP9/src/org/jboss/cache/marshall/JBCMethodCall.java	2008-01-22 10:34:19 UTC (rev 5184)
+++ core/tags/1.4.1.SP9/src/org/jboss/cache/marshall/JBCMethodCall.java	2008-01-22 10:48:02 UTC (rev 5185)
@@ -69,22 +69,13 @@
       ret.append("; Args: (");
       if (args != null && args.length > 0)
       {
-         if (trace)
+         boolean first = true;
+         for (int i=0; i<args.length; i++)
          {
-            boolean first = true;
-            for (int i=0; i<args.length; i++)
-            {
-               if (first) first = false;
-               else ret.append(", ");
-               ret.append(args[i]);
-            }
+            if (first) first = false;
+            else ret.append(", ");
+            ret.append(args[i]);
          }
-         else
-         {
-            ret.append(" arg[0] = ");
-            ret.append(args[0]);
-            if (args.length > 1) ret.append(" ...");
-         }
       }
       ret.append(')');
       return ret.toString();

Deleted: core/tags/1.4.1.SP9/tests/functional/org/jboss/cache/buddyreplication/RemoveRootBuddyTest.java
===================================================================
--- core/tags/1.4.1.SP9/tests/functional/org/jboss/cache/buddyreplication/RemoveRootBuddyTest.java	2008-01-22 10:34:19 UTC (rev 5184)
+++ core/tags/1.4.1.SP9/tests/functional/org/jboss/cache/buddyreplication/RemoveRootBuddyTest.java	2008-01-22 10:48:02 UTC (rev 5185)
@@ -1,44 +0,0 @@
-package org.jboss.cache.buddyreplication;
-
-import org.jboss.cache.Fqn;
-import org.jboss.cache.TreeCache;
-import org.jboss.cache.misc.TestingUtil;
-
-import java.util.ArrayList;
-
-/**
- * Test added to replicate a found issue - JBCACHE-1241
- *
- * @author Mircea.Markus at jboss.com
- */
-public class RemoveRootBuddyTest extends BuddyReplicationTestsBase
-{
-   TreeCache cache1, cache2;
-
-   protected void setUp() throws Exception
-   {
-      cache1 = createCache(false, 1, "myBuddyPoolReplicationGroup", false, true, true);
-      cache2 = createCache(false, 1, "myBuddyPoolReplicationGroup", false, true, true);
-
-      TestingUtil.blockUntilViewsReceived(new TreeCache[]{cache1, cache2}, 60000);
-   }
-
-   protected void tearDown()
-   {
-      cache1.stop();
-      cache2.stop();
-   }
-
-   public void testRemoveRootNode() throws Exception
-   {
-      int opCount = 10;
-      for (int i = 0; i < opCount; i++)
-      {
-         String key = String.valueOf(opCount);
-         String value = String.valueOf(opCount);
-         Fqn f = Fqn.fromString("/test" + key);
-         cache1.put(f, key, value);
-      }
-      cache1.remove(Fqn.ROOT);
-   }
-}