From 3225377d57acd0db675bdc27723a1f9f536526ab Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 07 Jul 2016 10:38:32 +0000
Subject: [PATCH] Use HostPort more in replication
---
opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
index 1a781a3..e1f6f10 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
@@ -61,7 +61,6 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.Attributes;
import org.opends.server.types.Entry;
-import org.opends.server.types.HostPort;
import org.opends.server.types.Modification;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.util.TestTimer;
@@ -550,17 +549,13 @@
@Override
public Void call() throws Exception
{
- assertEquals(DirectoryServer.entryExists(dn), exist);
+ assertEquals(DirectoryServer.entryExists(dn), exist, "Expected entry with dn \"" + dn + "\" would exist");
return null;
}
});
Entry entry = DirectoryServer.getEntry(dn);
- if (entry != null)
- {
- return entry.duplicate(true);
- }
- return null;
+ return entry != null ? entry.duplicate(true) : null;
}
/** Update the monitor count for the specified monitor attribute. */
@@ -923,9 +918,8 @@
boolean rightPort = false;
if (connected)
{
- String rsUrl = rd.getReplicationServer();
try {
- rdPort = HostPort.valueOf(rsUrl).getPort();
+ rdPort = rd.getReplicationServer().getPort();
rightPort = rdPort == rsPort;
}
catch (IllegalArgumentException notConnectedYet)
--
Gitblit v1.10.0