From 1ad53161c35dfbd2c08b1f124d237f5f3cad9110 Mon Sep 17 00:00:00 2001
From: jdemendi <jdemendi@localhost>
Date: Thu, 19 Jul 2007 07:46:13 +0000
Subject: [PATCH] This set of changes is aiming at having a more consistent and clean code when an operation is canceled.
---
opends/src/server/org/opends/server/core/ModifyOperationBasis.java | 147 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 102 insertions(+), 45 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/ModifyOperationBasis.java b/opends/src/server/org/opends/server/core/ModifyOperationBasis.java
index f02b61f..5d7e6f8 100644
--- a/opends/src/server/org/opends/server/core/ModifyOperationBasis.java
+++ b/opends/src/server/org/opends/server/core/ModifyOperationBasis.java
@@ -540,14 +540,18 @@
setProcessingStartTime();
// Check for and handle a request to cancel this operation.
- if (getCancelRequest() != null)
+ if (cancelRequest != null)
{
- indicateCancelled(getCancelRequest());
+ indicateCancelled(cancelRequest);
setProcessingStopTime();
return;
}
+ // This flag is set to true as soon as a workflow has been executed.
+ boolean workflowExecuted = false;
+
+
// Create a labeled block of code that we can break out of if a problem is
// detected.
modifyProcessing:
@@ -584,13 +588,10 @@
// Log the modify request message.
logModifyRequest(this);
- // Check for and handle a request to cancel this operation.
+ // Check for a request to cancel this operation.
if (getCancelRequest() != null)
{
- indicateCancelled(getCancelRequest());
- setProcessingStopTime();
- pluginConfigManager.invokePostResponseModifyPlugins(this);
- return;
+ break modifyProcessing;
}
@@ -614,28 +615,43 @@
break modifyProcessing;
}
workflow.execute(this);
+ workflowExecuted = true;
+
+ } // end of processing block
+
+
+ // Check for a terminated connection.
+ if (getCancelResult() == CancelResult.CANCELED)
+ {
+ // Stop the processing timer.
+ setProcessingStopTime();
+
+ // Log the add response message.
+ logModifyResponse(this);
+
+ return;
}
// Check for and handle a request to cancel this operation.
- if ((getCancelRequest() != null) ||
- (getCancelResult() == CancelResult.CANCELED))
+ if (cancelRequest != null)
{
- if (getCancelRequest() != null){
- indicateCancelled(getCancelRequest());
- }
+ indicateCancelled(cancelRequest);
+
+ // Stop the processing timer.
setProcessingStopTime();
+
+ // Log the modify response message.
logModifyResponse(this);
- invokePostResponsePlugins();
+
+ // Invoke the post-response modify plugins.
+ invokePostResponsePlugins(workflowExecuted);
+
return;
}
// Indicate that it is now too late to attempt to cancel the operation.
setCancelResult(CancelResult.TOO_LATE);
- // -- DONE AT A LOWER LEVEL --
- // Notify any change notification listeners that might be registered with
- // the server.
-
// Stop the processing timer.
setProcessingStopTime();
@@ -645,10 +661,76 @@
// Log the modify response.
logModifyResponse(this);
- // Check wether there are local operations in attachments
+ // Notifies any persistent searches that might be registered with the
+ // server.
+ notifyPersistentSearches(workflowExecuted);
+
+ // Invoke the post-response modify plugins.
+ invokePostResponsePlugins(workflowExecuted);
+ }
+
+
+ /**
+ * Invokes the post response plugins. If a workflow has been executed
+ * then invoke the post response plugins provided by the workflow
+ * elements of the worklfow, otherwise invoke the post reponse plugins
+ * that have been registered with the current operation.
+ *
+ * @param workflowExecuted <code>true</code> if a workflow has been
+ * executed
+ */
+ private void invokePostResponsePlugins(boolean workflowExecuted)
+ {
+ // Get the plugin config manager that will be used for invoking plugins.
+ PluginConfigManager pluginConfigManager =
+ DirectoryServer.getPluginConfigManager();
+
+ // Invoke the post response plugins
+ if (workflowExecuted)
+ {
+ // Invoke the post response plugins that have been registered by
+ // the workflow elements
+ List localOperations =
+ (List)getAttachment(Operation.LOCALBACKENDOPERATIONS);
+
+ if (localOperations != null)
+ {
+ for (Object localOp : localOperations)
+ {
+ LocalBackendModifyOperation localOperation =
+ (LocalBackendModifyOperation)localOp;
+ pluginConfigManager.invokePostResponseModifyPlugins(localOperation);
+ }
+ }
+ }
+ else
+ {
+ // Invoke the post response plugins that have been registered with
+ // the current operation
+ pluginConfigManager.invokePostResponseModifyPlugins(this);
+ }
+ }
+
+
+ /**
+ * Notifies any persistent searches that might be registered with the server.
+ * If no workflow has been executed then don't notify persistent searches.
+ *
+ * @param workflowExecuted <code>true</code> if a workflow has been
+ * executed
+ */
+ private void notifyPersistentSearches(boolean workflowExecuted)
+ {
+ if (! workflowExecuted)
+ {
+ return;
+ }
+
List localOperations =
(List)getAttachment(Operation.LOCALBACKENDOPERATIONS);
- if (localOperations != null && (! localOperations.isEmpty())){
+
+ if (localOperations != null)
+ {
for (Object localOp : localOperations)
{
LocalBackendModifyOperation localOperation =
@@ -685,13 +767,11 @@
}
}
}
-
- // Invoke the post-response modify plugins.
- pluginConfigManager.invokePostResponseModifyPlugins(localOperation);
}
}
}
+
/**
* Updates the error message and the result code of the operation.
*
@@ -705,29 +785,6 @@
String.valueOf(getEntryDN())));
}
- /**
- * Execute the postResponseModifyPlugins.
- */
- private void invokePostResponsePlugins()
- {
- // Get the plugin config manager that will be used for invoking plugins.
- PluginConfigManager pluginConfigManager =
- DirectoryServer.getPluginConfigManager();
-
- // Check wether there are local operations in attachments
- List localOperations =
- (List)getAttachment(Operation.LOCALBACKENDOPERATIONS);
-
- if (localOperations != null && (! localOperations.isEmpty())){
- for (Object localOp : localOperations)
- {
- LocalBackendModifyOperation localOperation =
- (LocalBackendModifyOperation)localOp;
- // Invoke the post-response add plugins.
- pluginConfigManager.invokePostResponseModifyPlugins(localOperation);
- }
- }
- }
/**
* {@inheritDoc}
--
Gitblit v1.10.0