From 3a9145fbffce07e4c8be25bcda7ee4b2eed4e797 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Wed, 18 May 2016 12:05:17 +0000
Subject: [PATCH] OPENDJ-3027 Crypto related services should be started before replication

---
 opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
index ea44a46..dac3d0d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
@@ -1588,6 +1588,11 @@
 
       pluginConfigManager.initializeUserPlugins(null);
 
+      // Synchronization of ADS with the crypto manager.
+      // Need access to ADS keys before synchronization starts to be able to decode encrypted data in the backend
+      // by reading them from the trust store.
+      new CryptoManagerSync();
+
       if (!environmentConfig.disableSynchronization())
       {
         synchronizationProviderConfigManager = new SynchronizationProviderConfigManager(serverContext);
@@ -1621,9 +1626,6 @@
         new IdleTimeLimitThread().start();
       }
 
-      // Synchronization of ADS with the crypto manager.
-      new CryptoManagerSync();
-
       // Write a copy of the config if needed.
       if (saveConfigOnSuccessfulStartup)
       {

--
Gitblit v1.10.0