From dead58af9c9e4653a2a48f882d593441f3cb0e1e Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 27 May 2010 09:16:08 +0000
Subject: [PATCH] Resolve an issue with disabling replication of a suffix and the External changelog.
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java | 7 ++++++-
opendj-sdk/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
index 1b8efbb..279bfa7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2009 Sun Microsystems, Inc.
+ * Copyright 2009-2010 Sun Microsystems, Inc.
*/
package org.opends.server.replication.server;
@@ -717,7 +717,12 @@
// skip the excluded domains
if (excludedServiceIDs.contains(rsd.getBaseDn()))
+ {
+ // this is an excluded domain
+ if (allowUnknownDomains)
+ startStatesFromProvidedCookie.remove(rsd.getBaseDn());
continue;
+ }
// skip unused domains
if (rsd.getDbServerState().isEmpty())
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
index 6d7ac4c..68c4833 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
@@ -54,6 +54,9 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import org.opends.messages.Category;
+import org.opends.messages.Message;
+import org.opends.messages.Severity;
import org.opends.server.TestCaseUtils;
import org.opends.server.api.Backend;
import org.opends.server.api.ConnectionHandler;
@@ -141,6 +144,7 @@
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import static org.opends.server.loggers.ErrorLogger.logError;
/**
@@ -1078,6 +1082,7 @@
replicationServer.getReplicationServerDomain(TEST_ROOT_DN_STRING, false);
ServerState startState = rsd.getStartState();
assertTrue(startState.getMaxChangeNumber(s1test.getServerId()).getSeqnum()==1);
+ assertTrue(startState.getMaxChangeNumber(s2test.getServerId()) != null);
assertTrue(startState.getMaxChangeNumber(s2test.getServerId()).getSeqnum()==7);
rsd =
@@ -4094,4 +4099,4 @@
operation.getErrorMessage().toString());
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.10.0