From a128022ac288ec241c2ff37e9c9aad87c4c42d1c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 08 Jul 2016 12:59:10 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index f611aa5..bb1c122 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/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)
--
Gitblit v1.10.0