From 470936255a009dd659e3736df92ce1a6c2767362 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:35 +0000
Subject: [PATCH] Extracted method ServerContext.getRootConfig()
---
opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
index 70d2a45..5c1ec35 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -437,9 +437,7 @@
}
if (couldInitializeConfig)
{
- // Get the Directory Server configuration handler and use it.
- RootCfg root =
- DirectoryServer.getInstance().getServerContext().getServerManagementContext().getRootConfiguration();
+ RootCfg root = DirectoryServer.getInstance().getServerContext().getRootConfig();
administrationConnectorCfg = root.getAdministrationConnector();
String trustManagerStr = administrationConnectorCfg.getTrustManagerProvider();
@@ -496,8 +494,7 @@
}
if (couldInitializeConfiguration)
{
- RootCfg root =
- DirectoryServer.getInstance().getServerContext().getServerManagementContext().getRootConfiguration();
+ RootCfg root = DirectoryServer.getInstance().getServerContext().getRootConfig();
return root.getAdministrationConnector().getListenPort();
}
else
@@ -511,10 +508,9 @@
// check if the initialization is required
try
{
- DirectoryServer.getInstance().getServerContext().getServerManagementContext()
- .getRootConfiguration().getAdministrationConnector();
+ DirectoryServer.getInstance().getServerContext().getRootConfig().getAdministrationConnector();
}
- catch (java.lang.Throwable th)
+ catch (Throwable th)
{
try
{
--
Gitblit v1.10.0