From 05dfa5fee15b191c3ee1afae0010b70733b1a35b Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Mon, 25 Jun 2007 15:51:57 +0000
Subject: [PATCH] Update the pre-parse and pre-operation plugin results to add the ability to skip core processing without skipping post-operation plugins.  Also, make sure that post-response plugins are always invoked for all operations that get far enough in their processing to have called the pre-parse plugins.

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

diff --git a/opends/src/server/org/opends/server/core/DeleteOperation.java b/opends/src/server/org/opends/server/core/DeleteOperation.java
index 9457386..c28f696 100644
--- a/opends/src/server/org/opends/server/core/DeleteOperation.java
+++ b/opends/src/server/org/opends/server/core/DeleteOperation.java
@@ -526,6 +526,7 @@
 
         logDeleteRequest(this);
         logDeleteResponse(this);
+        pluginConfigManager.invokePostResponseDeletePlugins(this);
         return;
       }
       else if (preParseResult.sendResponseImmediately())
@@ -534,6 +535,11 @@
         logDeleteRequest(this);
         break deleteProcessing;
       }
+      else if (preParseResult.skipCoreProcessing())
+      {
+        skipPostOperation = false;
+        break deleteProcessing;
+      }
 
 
       // Log the delete request message.
@@ -546,6 +552,7 @@
         indicateCancelled(cancelRequest);
         processingStopTime = System.currentTimeMillis();
         logDeleteResponse(this);
+        pluginConfigManager.invokePostResponseDeletePlugins(this);
         return;
       }
 
@@ -983,6 +990,7 @@
           indicateCancelled(cancelRequest);
           processingStopTime = System.currentTimeMillis();
           logDeleteResponse(this);
+          pluginConfigManager.invokePostResponseDeletePlugins(this);
           return;
         }
 
@@ -1004,6 +1012,7 @@
 
             processingStopTime = System.currentTimeMillis();
             logDeleteResponse(this);
+            pluginConfigManager.invokePostResponseDeletePlugins(this);
             return;
           }
           else if (preOpResult.sendResponseImmediately())
@@ -1011,6 +1020,11 @@
             skipPostOperation = true;
             break deleteProcessing;
           }
+          else if (preOpResult.skipCoreProcessing())
+          {
+            skipPostOperation = false;
+            break deleteProcessing;
+          }
         }
 
 
@@ -1020,6 +1034,7 @@
           indicateCancelled(cancelRequest);
           processingStopTime = System.currentTimeMillis();
           logDeleteResponse(this);
+          pluginConfigManager.invokePostResponseDeletePlugins(this);
           return;
         }
 
@@ -1280,6 +1295,7 @@
 
         processingStopTime = System.currentTimeMillis();
         logDeleteResponse(this);
+        pluginConfigManager.invokePostResponseDeletePlugins(this);
         return;
       }
     }

--
Gitblit v1.10.0