[jboss-cvs] JBoss Messaging SVN: r3754 - in branches/Branch_JBossMessaging_1_4_0_SP3_CP: tests/src/org/jboss/test/messaging/core and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2008-02-21 10:55:22 -0500 (Thu, 21 Feb 2008)
New Revision: 3754

Modified:
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/IDManager.java
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/core/IdManagerTest.java
Log:
Reverting changes http://jira.jboss.org/jira/browse/JBMESSAGING-1233

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/IDManager.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/IDManager.java	2008-02-21 12:46:40 UTC (rev 3753)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/IDManager.java	2008-02-21 15:55:22 UTC (rev 3754)
@@ -120,12 +120,7 @@
 
    public synchronized long getID() throws Exception
    {
-	   if (low == high)
-	   {
-		   getNextBigBlock();
-	   }
-	   
-	   return low++;
+      return getIDBlock(1).getLow();
    }
 
    public String toString()

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/core/IdManagerTest.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/core/IdManagerTest.java	2008-02-21 12:46:40 UTC (rev 3753)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/core/IdManagerTest.java	2008-02-21 15:55:22 UTC (rev 3754)
@@ -124,29 +124,7 @@
       
       idm.stop();
    }
-   
-   public void testMixNextAndBlocks() throws Exception
-   {
-      IDManager idm = new IDManager("test_counter3", 100, pm);
-      idm.start();
 
-      for (long i=0;i<50;i++)
-      {
-         assertEquals(i, idm.getID());
-      }
-      
-      IDBlock block = idm.getIDBlock(100);
-      assertEquals(100, block.getLow());
-      assertEquals(199, block.getHigh());
-      
-      assertEquals(200, idm.getID());
-      
-      for (long i=201;i<1000;i++)
-      {
-        assertEquals(i, idm.getID());
-      }
-   }
-
    // Package protected ---------------------------------------------
 
    // Protected -----------------------------------------------------