From ab7ae2fd06d636915199bf9ca5804f2a0a41fa66 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 17 Oct 2013 13:50:45 +0000
Subject: [PATCH] Fixed GenerationIdTest.generationIdTest(): test was failing precisely because the directory server's broker was not connected to a replication domain, hence it was impossible to add the changes to the changelogDB and then find them when querying the changelogDB.

---
 opends/src/server/org/opends/server/replication/service/ReplicationBroker.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
index 9b3dc97..585a7d2 100644
--- a/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -3042,9 +3042,23 @@
   @Override
   public String toString()
   {
-    return getClass().getSimpleName() + " \"" + baseDN + " " + serverId + "\","
-        + " groupId=" + groupId + ", genId=" + generationID
-        + ", bestRS(serverId=" + rsServerId + ", serverUrl=" + rsServerUrl
-        + ", groupId=" + rsGroupId + ")";
+    final StringBuilder sb = new StringBuilder();
+    sb.append(getClass().getSimpleName())
+      .append(" \"").append(baseDN).append(" ").append(serverId).append("\",")
+      .append(" groupId=").append(groupId)
+      .append(", genId=").append(generationID)
+      .append(", connected=").append(connected).append(", ");
+    if (rsServerId == -1)
+    {
+      sb.append("no RS");
+    }
+    else
+    {
+      sb.append("bestRS(serverId=").append(rsServerId)
+        .append(", serverUrl=").append(rsServerUrl)
+        .append(", groupId=").append(rsGroupId)
+        .append(")");
+    }
+    return sb.toString();
   }
 }

--
Gitblit v1.10.0