From b45a7bf251b59ef156cfd7f3235384ac8835fcd4 Mon Sep 17 00:00:00 2001
From: pgamba <pgamba@localhost>
Date: Thu, 24 May 2007 13:14:06 +0000
Subject: [PATCH] [Issue 1085] Synchronization protocol must be extensible
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index dd19136..d37f9cc 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -340,18 +340,23 @@
DN.decode(synchroPluginStringDN)),
"Unable to add the Multimaster replication plugin");
-
- // Add the replication server
- DirectoryServer.getConfigHandler().addEntry(replServerEntry, null);
- assertNotNull(DirectoryServer.getConfigEntry(replServerEntry.getDN()),
+ if (replServerEntry != null)
+ {
+ // Add the replication server
+ DirectoryServer.getConfigHandler().addEntry(replServerEntry, null);
+ assertNotNull(DirectoryServer.getConfigEntry(replServerEntry.getDN()),
"Unable to add the replication server");
- configEntryList.add(replServerEntry.getDN());
+ configEntryList.add(replServerEntry.getDN());
+ }
- // We also have a replicated suffix (replication domain)
- DirectoryServer.getConfigHandler().addEntry(synchroServerEntry, null);
- assertNotNull(DirectoryServer.getConfigEntry(synchroServerEntry.getDN()),
- "Unable to add the synchronized server");
- configEntryList.add(synchroServerEntry.getDN());
+ if (synchroServerEntry != null)
+ {
+ // We also have a replicated suffix (replication domain)
+ DirectoryServer.getConfigHandler().addEntry(synchroServerEntry, null);
+ assertNotNull(DirectoryServer.getConfigEntry(synchroServerEntry.getDN()),
+ "Unable to add the synchronized server");
+ configEntryList.add(synchroServerEntry.getDN());
+ }
}
/**
--
Gitblit v1.10.0