From 79456ab528b185983884c14443e0fe64425874da Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 07 Jul 2016 13:03:32 +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 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 71bffc5..f611aa5 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
@@ -1470,10 +1470,10 @@
{
return;
}
- catch (NamingException ne)
+ catch (NamingException e)
{
- throw new ReplicationCliException(getThrowableMsg(ERR_READING_SERVER_TASK_PROGRESS.get(), ne),
- ERROR_CONNECTING, ne);
+ throw new ReplicationCliException(getThrowableMsg(ERR_READING_SERVER_TASK_PROGRESS.get(), e),
+ ERROR_CONNECTING, e);
}
}
}
@@ -1700,7 +1700,7 @@
for (BaseDNDescriptor baseDN : backend.getBaseDns())
{
SuffixDescriptor suffix = new SuffixDescriptor();
- suffix.setDN(baseDN.getDn().toString());
+ suffix.setDN(baseDN.getDn());
ReplicaDescriptor replica = new ReplicaDescriptor();
@@ -3723,8 +3723,8 @@
suffixes.add(rep1SuffixDN);
}
break;
- default:
- throw new IllegalStateException("Unknown type: "+type);
+ default:
+ throw new IllegalStateException("Unknown type: " + type);
}
}
}
@@ -5478,10 +5478,10 @@
{
return ServerDescriptor.createStandalone(conn, filter);
}
- catch (NamingException ne)
+ catch (IOException e)
{
throw new ReplicationCliException(
- getMessageForException(ne, conn.getHostPort().toString()), ERROR_READING_CONFIGURATION, ne);
+ getMessageForException(e, conn.getHostPort().toString()), ERROR_READING_CONFIGURATION, e);
}
}
@@ -6969,7 +6969,7 @@
}
}
}
- catch (NamingException ne)
+ catch (IOException ne)
{
LocalizableMessage msg = getMessageForException(ne, connSource.getHostPort().toString());
throw new ReplicationCliException(msg, ERROR_READING_CONFIGURATION, ne);
--
Gitblit v1.10.0