OPENDJ-1271 (CR-3008) dsreplication pre-external-initialization task fails ...

Jean-Noel Rouvignac

20.08.2014 1c59d6c7d4e33c5b88fbe0692c1d50c0eab74c4a

 opendj3-server-dev/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);