From 1b4603e10c65c535a04e66c9fad1c602abb854c8 Mon Sep 17 00:00:00 2001
From: jdemendi <jdemendi@localhost>
Date: Tue, 25 Mar 2008 17:17:45 +0000
Subject: [PATCH] rollback fix for 2991, return entry should go through workflow elements
---
opends/src/server/org/opends/server/core/SearchOperationWrapper.java | 48 ++----------------------------------------------
1 files changed, 2 insertions(+), 46 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/SearchOperationWrapper.java b/opends/src/server/org/opends/server/core/SearchOperationWrapper.java
index f4545c9..31864f9 100644
--- a/opends/src/server/org/opends/server/core/SearchOperationWrapper.java
+++ b/opends/src/server/org/opends/server/core/SearchOperationWrapper.java
@@ -41,7 +41,6 @@
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.SearchResultReference;
import org.opends.server.types.SearchScope;
-import org.opends.server.workflowelement.WorkflowElement;
/**
@@ -55,24 +54,6 @@
// The wrapped operation.
private SearchOperation search;
- // The workflow element which has invoked the current operation.
- // The returned entries and returned references must be sent to that
- // workflow element.
- private WorkflowElement<?> callingWorkflowElement = null;
-
- /**
- * Set the calling workflow element.
- *
- * @param callingWorkflowElement the workflow element which has invoked
- * the current operation
- */
- public void setCallingWorkflowElement(
- WorkflowElement<?> callingWorkflowElement
- )
- {
- this.callingWorkflowElement = callingWorkflowElement;
- }
-
/**
* Creates a new search operation based on the provided search operation.
*
@@ -91,20 +72,7 @@
{
boolean result;
- // If the calling workflow element is defined then send the return
- // entry to the workflow element, otherwise send the entry to the
- // calling operation.
- // Sometimes, the calling workflow element might not be set for
- // an internal operation because the internal search is done using
- // a local backend operation instead of an operation basis.
- if (callingWorkflowElement != null)
- {
- result = callingWorkflowElement.returnEntry(entry, controls);
- }
- else
- {
- result = this.search.returnEntry(entry, controls);
- }
+ result = this.search.returnEntry(entry, controls);
return result;
}
@@ -116,19 +84,7 @@
{
boolean result;
- // If the calling workflow element is not set then send the
- // reference to the calling operation, otherwise send the reference
- // to the calling workflow element.
- // an internal operation because the internal search is done using
- // a local backend operation instead of an operation basis.
- if (callingWorkflowElement != null)
- {
- result = callingWorkflowElement.returnReference(dn, reference);
- }
- else
- {
- result = this.search.returnReference(dn, reference);
- }
+ result = this.search.returnReference(dn, reference);
return result;
}
--
Gitblit v1.10.0