From 1b12eb719f2aeec7624182b983d79fc949d7cea2 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 05 May 2015 15:26:50 +0000
Subject: [PATCH] OPENDJ-1932 CR-6839 Improve management context API

---
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index adcfde5..36bdce0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -1019,18 +1019,18 @@
       try
       {
         getInfo().initializeConfigurationFramework();
-        final List<IOException> exceptions = new ArrayList<>();
-        final org.forgerock.opendj.config.client.ManagementContext context =
-            org.forgerock.opendj.config.client.ldap.LDAPManagementContext.newLDIFManagementContext(
-                Installation.getLocal().getCurrentConfigurationFile(), LDAPProfile.getInstance(), exceptions);
-        final org.forgerock.opendj.server.config.client.BackendCfgClient backend =
-            context.getRootConfiguration().getBackend(backendName);
-        final SortedSet<org.forgerock.opendj.ldap.DN> baseDNs = backend.getBaseDN();
-        baseDNs.add(org.forgerock.opendj.ldap.DN.valueOf(newBaseDN));
-        backend.setBaseDN(baseDNs);
-        backend.commit();
-        context.close();
-        Utilities.throwFirstFrom(exceptions);
+        final File config = Installation.getLocal().getCurrentConfigurationFile();
+        final LDAPProfile profile = LDAPProfile.getInstance();
+        try (org.forgerock.opendj.config.client.ManagementContext context =
+            org.forgerock.opendj.config.client.ldap.LDAPManagementContext.newLDIFManagementContext(config, profile))
+        {
+          final org.forgerock.opendj.server.config.client.BackendCfgClient backend =
+              context.getRootConfiguration().getBackend(backendName);
+          final SortedSet<org.forgerock.opendj.ldap.DN> baseDNs = backend.getBaseDN();
+          baseDNs.add(org.forgerock.opendj.ldap.DN.valueOf(newBaseDN));
+          backend.setBaseDN(baseDNs);
+          backend.commit();
+        }
       }
       catch (Exception e)
       {

--
Gitblit v1.10.0