svn commit: r552604 - in /directory/apacheds/trunk/mitosis/src: main/java/org/apache/directory/mitosis/common/DefaultCSNFactory.java test/java/org/apache/directory/mitosis/common/DefaultCSNFactoryTest.java

[ma...@apache.org]

Author: malderson
Date: Mon Jul  2 14:57:42 2007
New Revision: 552604

URL: http://svn.apache.org/viewvc?view=rev&rev=552604
Log:
Fixed a problem where two CSN's generated in the same millisecond could be the same (DIRSERVER-940).  Now the operation sequence number is always incremented which also gives us some protection against system clock changes.

Added:
    directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/common/DefaultCSNFactoryTest.java
Modified:
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultCSNFactory.java

Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultCSNFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultCSNFactory.java?view=diff&rev=552604&r1=552603&r2=552604
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultCSNFactory.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultCSNFactory.java Mon Jul  2 14:57:42 2007
@@ -28,7 +28,6 @@
 public class DefaultCSNFactory implements CSNFactory
 {
     private static int operationSequence;
-    private static long lastTimestamp = System.currentTimeMillis();
 
 
     public DefaultCSNFactory()
@@ -53,13 +52,12 @@
     public synchronized CSN newInstance( ReplicaId replicaId )
     {
         long newTimestamp = System.currentTimeMillis();
-        if ( lastTimestamp == newTimestamp )
+        if ( operationSequence == Integer.MAX_VALUE )
         {
             operationSequence = 0;
         }
 
         CSN newCSN = new DefaultCSN( newTimestamp, replicaId, operationSequence++ );
-        lastTimestamp = newTimestamp;
         return newCSN;
     }
 }

Added: directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/common/DefaultCSNFactoryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/common/DefaultCSNFactoryTest.java?view=auto&rev=552604
==============================================================================
--- directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/common/DefaultCSNFactoryTest.java (added)
+++ directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/common/DefaultCSNFactoryTest.java Mon Jul  2 14:57:42 2007
@@ -0,0 +1,61 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+
+package org.apache.directory.mitosis.common;
+
+
+import junit.framework.TestCase;
+
+
+/**
+ * Test case for the DefaultCSNFactory class.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class DefaultCSNFactoryTest extends TestCase
+{
+    private static final int NUM_GENERATES = 10;
+
+
+    /**
+     * Ensure all CSN's generated by a CSNFactory are unique.
+     *
+     */
+    public void testUnique()
+    {
+        String replicaID = "test";
+        DefaultCSNFactory defaultCSNFactory = new DefaultCSNFactory();
+
+        CSN[] csns = new CSN[NUM_GENERATES];
+
+        for ( int i = 0; i < NUM_GENERATES; i++ )
+        {
+            csns[i] = defaultCSNFactory.newInstance( replicaID );
+        }
+
+        for ( int i = 0; i < NUM_GENERATES; i++ )
+        {
+            for ( int j = i + 1; j < NUM_GENERATES; j++ )
+            {
+                assertFalse( csns[i].equals( csns[j] ) );
+            }
+        }
+    }
+}