mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noël Rouvignac
07.41.2016 a128022ac288ec241c2ff37e9c9aad87c4c42d1c
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -3821,17 +3821,13 @@
   */
  private ReplicationCliReturnCode enableReplication(EnableReplicationUserData uData)
  {
    ConnectionWrapper conn1 = null;
    ConnectionWrapper conn2 = null;
    try
    println();
    print(formatter.getFormattedWithPoints(INFO_REPLICATION_CONNECTING.get()));
    List<LocalizableMessage> errorMessages = new LinkedList<>();
    try (ConnectionWrapper conn1 = createAdministrativeConnection(uData.getServer1(), errorMessages);
        ConnectionWrapper conn2 = createAdministrativeConnection(uData.getServer2(), errorMessages))
    {
      println();
      print(formatter.getFormattedWithPoints(INFO_REPLICATION_CONNECTING.get()));
      List<LocalizableMessage> errorMessages = new LinkedList<>();
      conn1 = createAdministrativeConnection(uData.getServer1(), errorMessages);
      conn2 = createAdministrativeConnection(uData.getServer2(), errorMessages);
      if (!errorMessages.isEmpty())
      {
        errPrintLn(errorMessages);
@@ -3887,10 +3883,6 @@
        return rce.getErrorCode();
      }
    }
    finally
    {
      close(conn1, conn2);
    }
  }
  private void checkReplicationServerAlreadyConfigured(ConnectionWrapper conn, EnableReplicationServerData server)
@@ -4132,9 +4124,8 @@
   */
  private ReplicationCliReturnCode initializeReplication(SourceDestinationServerUserData uData)
  {
    ConnectionWrapper connSource = createAdministrativeConnection(uData, uData.getSource());
    ConnectionWrapper connDestination = createAdministrativeConnection(uData, uData.getDestination());
    try
    try (ConnectionWrapper connSource = createAdministrativeConnection(uData, uData.getSource());
        ConnectionWrapper connDestination = createAdministrativeConnection(uData, uData.getDestination()))
    {
      if (connSource == null || connDestination == null)
      {
@@ -4175,10 +4166,6 @@
      }
      return returnValue;
    }
    finally
    {
      close(connDestination, connSource);
    }
  }
  private ConnectionWrapper createAdministrativeConnection(SourceDestinationServerUserData uData, HostPort server)