From 2250643bd27e47583d10cb33964693c6b44450d9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] Fix failing tests and cleanup

---
 opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java b/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java
index b62d55f..bde41ab 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java
@@ -81,8 +81,9 @@
   public ServerContextBuilder withConfigurationBootstrapped()
       throws InitializationException
   {
-    final ServerManagementContext serverManagementContext =
+    final ConfigurationHandler configHandler =
         ConfigurationBootstrapper.bootstrap(serverContext, ConfigurationHandler.class);
+    final ServerManagementContext serverManagementContext = new ServerManagementContext(configHandler);
     when(serverContext.getServerManagementContext()).thenReturn(serverManagementContext);
     return this;
   }

--
Gitblit v1.10.0