From 6d3607b2f2a070bacc7bd331a4dc49f5335e7df8 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 08 Jan 2007 15:38:16 +0000
Subject: [PATCH] Fix a problem in org.opends.server.synchronization.common.ChangeNumberGenerator.adjust() found by a code review where this method can fail because it only increment the time by one unit even if the time difference is larger than this.
---
opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java | 2 +-
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberGeneratorTest.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java
index c3496f9..40358aa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java
@@ -121,7 +121,7 @@
if (lastTime > rcvdTime)
return;
else
- lastTime = lastTime++;
+ lastTime = rcvdTime++;
}
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberGeneratorTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberGeneratorTest.java
new file mode 100644
index 0000000..4e65a74
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberGeneratorTest.java
@@ -0,0 +1,58 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.synchronization.common;
+
+import static org.testng.Assert.*;
+
+import org.opends.server.synchronization.SynchronizationTestCase;
+import org.opends.server.util.TimeThread;
+import org.testng.annotations.Test;
+
+public class ChangeNumberGeneratorTest extends SynchronizationTestCase
+{
+ /**
+ * Test the adjust method of ChangeNumberGenerator
+ */
+ @Test(dataProvider = "changeNumberData")
+ public void adjustTest()
+ {
+ ChangeNumberGenerator generator =
+ new ChangeNumberGenerator((short)5, TimeThread.getTime());
+
+ ChangeNumber cn = generator.NewChangeNumber();
+
+ ChangeNumber cn1 =
+ new ChangeNumber(cn.getTime() + 5000, cn.getSeqnum(), (short) 6);
+ generator.adjust(cn1);
+
+ ChangeNumber cn2 = generator.NewChangeNumber();
+
+ assertTrue((cn2.compareTo(cn1)>0),
+ "ChangeNumberGenerator generated an earlier ChangeNumber "
+ + " after calling the adjust method.");
+ }
+}
--
Gitblit v1.10.0