From 1b2aef9b94118fd536c394516fefc8b059e8205a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 19 Feb 2014 16:57:04 +0000
Subject: [PATCH] OPENDJ-1271 (CR-3008) dsreplication pre-external-initialization task fails with STOPPED_BY_ERROR
---
opends/src/server/org/opends/server/replication/common/DSInfo.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/common/DSInfo.java b/opends/src/server/org/opends/server/replication/common/DSInfo.java
index fb42a43..bb062fa 100644
--- a/opends/src/server/org/opends/server/replication/common/DSInfo.java
+++ b/opends/src/server/org/opends/server/replication/common/DSInfo.java
@@ -283,9 +283,9 @@
&& equals(eclIncludesForDeletes, dsInfo.getEclIncludesForDeletes());
}
- private boolean equals(Set<String> o1, Set<String> o2)
+ private boolean equals(Object o1, Object o2)
{
- return (o1 == null && o2 == null) || (o1 != null && o1.equals(o2));
+ return o1 == null ? o2 == null : o1.equals(o2);
}
/**
@@ -320,15 +320,18 @@
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
sb.append("DS id: ").append(dsId);
sb.append(" ; DS url: ").append(dsUrl);
sb.append(" ; RS id: ").append(rsId);
sb.append(" ; Generation id: ").append(generationId);
sb.append(" ; Status: ").append(status);
sb.append(" ; Assured replication: ").append(assuredFlag);
- sb.append(" ; Assured mode: ").append(assuredMode);
- sb.append(" ; Safe data level: ").append(safeDataLevel);
+ if (assuredFlag)
+ {
+ sb.append(" ; Assured mode: ").append(assuredMode);
+ sb.append(" ; Safe data level: ").append(safeDataLevel);
+ }
sb.append(" ; Group id: ").append(groupId);
sb.append(" ; Protocol version: ").append(protocolVersion);
sb.append(" ; Referral URLs: ").append(refUrls);
--
Gitblit v1.10.0