[jboss-cvs] JBoss Messaging SVN: r3921 - branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl.

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

Author: timfox
Date: 2008-03-25 08:52:47 -0400 (Tue, 25 Mar 2008)
New Revision: 3921

Modified:
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-1233


Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java	2008-03-22 18:19:58 UTC (rev 3920)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java	2008-03-25 12:52:47 UTC (rev 3921)
@@ -264,11 +264,6 @@
          wrap.end();
       }
 
-      if (detectDuplicates)
-      {
-         loadIDCache(idCache, nodeID);
-      }
-
       log.debug(this + " started");
    }
 
@@ -283,13 +278,18 @@
 
    // This is only known by server peer so we inject it after startup
 
-   public void injectNodeID(int nodeID)
+   public void injectNodeID(int nodeID) throws Exception
    {
       this.nodeID = nodeID;
 
       this.nodeIDSet = true;
 
       this.orderingID = new RotatingID(nodeID);
+      
+      if (detectDuplicates)
+      {
+         loadIDCache(idCache, nodeID);
+      }
    }
 
    // PersistenceManager implementation -------------------------
@@ -1665,7 +1665,7 @@
          while (rs.next() && c < idCacheSize)
          {
             int counter = rs.getInt(1);
-
+            
             String id = rs.getString(2);
 
             cache.put(counter, id);
@@ -1676,7 +1676,7 @@
          }
 
          idCacheCounter = maxCounter + 1;
-
+         
          if (idCacheCounter >= idCacheSize)
          {
             idCacheCounter = 0;