From bf135c5c0f1c9b949de97f97092780f8c3d9a8a2 Mon Sep 17 00:00:00 2001
From: jdemendi <jdemendi@localhost>
Date: Tue, 04 Nov 2008 09:53:59 +0000
Subject: [PATCH] fix 3560, Cannot recreate a workflow after a create/delete

---
 opends/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java b/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java
index 40df1d2..35d4276 100644
--- a/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java
+++ b/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java
@@ -28,6 +28,9 @@
 
 
 
+import static org.opends.messages.CoreMessages.*;
+import static org.opends.server.loggers.ErrorLogger.logError;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.SortedSet;
@@ -332,7 +335,18 @@
     {
       WorkflowImpl workflowImpl =
         (WorkflowImpl) WorkflowImpl.getWorkflow(workflowID);
-      networkGroup.registerWorkflow(workflowImpl);
+      if (workflowImpl == null)
+      {
+        // The workflow does not exist, log an error message
+        // and skip the workflow
+        Message message = INFO_ERR_WORKFLOW_DOES_NOT_EXIST.get(
+          workflowID, networkGroupId);
+        logError(message);
+      }
+      else
+      {
+        networkGroup.registerWorkflow(workflowImpl);
+      }
     }
 
     // register the root DSE workflow with the network group

--
Gitblit v1.10.0