From 3e8e32d7139c5f70a67f04e4e1337e8ee0b3a04b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Tue, 10 Feb 2009 18:38:49 +0000
Subject: [PATCH] Fix issue 3775: Intermittent unit test failure in NetworkGroupTest
---
opends/src/server/org/opends/server/core/DirectoryServer.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/DirectoryServer.java b/opends/src/server/org/opends/server/core/DirectoryServer.java
index f7dbdc3..0ee61f8 100644
--- a/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -2569,8 +2569,11 @@
workflowConfigManager = new WorkflowConfigManager();
workflowConfigManager.initializeWorkflows();
- networkGroupConfigManager = new NetworkGroupConfigManager();
- networkGroupConfigManager.initializeNetworkGroups();
+ if (networkGroupConfigManager == null)
+ {
+ networkGroupConfigManager = new NetworkGroupConfigManager();
+ networkGroupConfigManager.initializeNetworkGroups();
+ }
}
@@ -2583,6 +2586,13 @@
*/
private void configureWorkflowsAuto() throws ConfigException
{
+ // Make sure that the network group config manager is finalized.
+ if (networkGroupConfigManager != null)
+ {
+ networkGroupConfigManager.finalizeNetworkGroups();
+ networkGroupConfigManager = null;
+ }
+
// First of all re-initialize the current workflow configuration
NetworkGroup.resetConfig();
WorkflowImpl.resetConfig();
--
Gitblit v1.10.0