From 08b9a482d3aa5e93e7ffee9469c2d4042421c2d3 Mon Sep 17 00:00:00 2001
From: ctissot <ctissot@localhost>
Date: Fri, 20 Jun 2008 14:59:15 +0000
Subject: [PATCH] This small diff includes: . a minor change to reference RawFilter (public) instead of LDAPFilter (not public) in org.opends.server.protocols.ldap.SearchRequestProtocolOp . some typos mainly due to copy/paste
---
opends/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java | 2 +-
opends/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java | 2 +-
opends/src/messages/src/org/opends/messages/MessageDescriptor.java | 2 +-
opends/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java | 2 +-
opends/src/server/org/opends/server/types/operation/PreParseSearchOperation.java | 2 +-
opends/src/server/org/opends/server/core/SearchOperation.java | 2 +-
opends/src/server/org/opends/server/backends/SchemaBackend.java | 4 ++--
opends/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java | 2 +-
opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java | 13 +++++++------
opends/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java | 2 +-
10 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/opends/src/messages/src/org/opends/messages/MessageDescriptor.java b/opends/src/messages/src/org/opends/messages/MessageDescriptor.java
index 01138fb..6787a26 100644
--- a/opends/src/messages/src/org/opends/messages/MessageDescriptor.java
+++ b/opends/src/messages/src/org/opends/messages/MessageDescriptor.java
@@ -1082,7 +1082,7 @@
private final Map<Locale,String> formatStrMap = new HashMap<Locale,String>();
/**
- * Obtains the category of this descriptor. Gauranteed not to be null.
+ * Obtains the category of this descriptor. Guaranteed not to be null.
* @return Category of this message
*/
public final Category getCategory() {
diff --git a/opends/src/server/org/opends/server/backends/SchemaBackend.java b/opends/src/server/org/opends/server/backends/SchemaBackend.java
index 492f284..225d41a 100644
--- a/opends/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opends/src/server/org/opends/server/backends/SchemaBackend.java
@@ -2471,7 +2471,7 @@
* @param ditContentRule The DIT content rule to add or replace in the
* server schema.
* @param schema The schema to which the DIT content rule
- * should be be added.
+ * should be added.
* @param modifiedSchemaFiles The names of the schema files containing
* schema elements that have been updated as part
* of the schema modification.
@@ -2741,7 +2741,7 @@
* @param ditStructureRule The DIT structure rule to add or replace in
* the server schema.
* @param schema The schema to which the DIT structure rule
- * should be be added.
+ * should be added.
* @param modifiedSchemaFiles The names of the schema files containing
* schema elements that have been updated as part
* of the schema modification.
diff --git a/opends/src/server/org/opends/server/core/SearchOperation.java b/opends/src/server/org/opends/server/core/SearchOperation.java
index d4ab218..17e7a70 100644
--- a/opends/src/server/org/opends/server/core/SearchOperation.java
+++ b/opends/src/server/org/opends/server/core/SearchOperation.java
@@ -202,7 +202,7 @@
/**
* Retrieves the set of requested attributes for this search operation. Its
- * contents should not be be altered.
+ * contents should not be altered.
*
* @return The set of requested attributes for this search operation.
*/
diff --git a/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java b/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
index 0cd0474..f95b80e 100644
--- a/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
+++ b/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
@@ -42,6 +42,7 @@
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.LDAPException;
+import org.opends.server.types.RawFilter;
import org.opends.server.types.SearchScope;
import static org.opends.server.loggers.debug.DebugLogger.*;
@@ -81,7 +82,7 @@
private int timeLimit;
// The filter for this search request.
- private LDAPFilter filter;
+ private RawFilter filter;
// The set of requested attributes for this search request.
private LinkedHashSet<String> attributes;
@@ -108,7 +109,7 @@
public SearchRequestProtocolOp(ASN1OctetString baseDN, SearchScope scope,
DereferencePolicy dereferencePolicy,
int sizeLimit, int timeLimit,
- boolean typesOnly, LDAPFilter filter,
+ boolean typesOnly, RawFilter filter,
LinkedHashSet<String> attributes)
{
this.baseDN = baseDN;
@@ -281,7 +282,7 @@
*
* @return The filter for this search request.
*/
- public LDAPFilter getFilter()
+ public RawFilter getFilter()
{
return filter;
}
@@ -293,7 +294,7 @@
*
* @param filter The filter for this search request.
*/
- public void setFilter(LDAPFilter filter)
+ public void setFilter(RawFilter filter)
{
this.filter = filter;
}
@@ -582,10 +583,10 @@
}
- LDAPFilter filter;
+ RawFilter filter;
try
{
- filter = LDAPFilter.decode(elements.get(6));
+ filter = RawFilter.decode(elements.get(6));
}
catch (Exception e)
{
diff --git a/opends/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java b/opends/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
index d580cb2..1138b88 100644
--- a/opends/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
+++ b/opends/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
@@ -146,7 +146,7 @@
/**
* Retrieves the set of requested attributes for this search
- * operation. Its contents should not be be altered.
+ * operation. Its contents should not be altered.
*
* @return The set of requested attributes for this search
* operation.
diff --git a/opends/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java b/opends/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
index 8dce78e..5883e35 100644
--- a/opends/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
+++ b/opends/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
@@ -146,7 +146,7 @@
/**
* Retrieves the set of requested attributes for this search
- * operation. Its contents should not be be altered.
+ * operation. Its contents should not be altered.
*
* @return The set of requested attributes for this search
* operation.
diff --git a/opends/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java b/opends/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
index c526444..20fc7db 100644
--- a/opends/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
+++ b/opends/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
@@ -150,7 +150,7 @@
/**
* Retrieves the set of requested attributes for this search
- * operation. Its contents should not be be altered.
+ * operation. Its contents should not be altered.
*
* @return The set of requested attributes for this search
* operation.
diff --git a/opends/src/server/org/opends/server/types/operation/PreParseSearchOperation.java b/opends/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
index 00105ec..2376632c 100644
--- a/opends/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
+++ b/opends/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
@@ -190,7 +190,7 @@
/**
* Retrieves the set of requested attributes for this search
- * operation. Its contents should not be be altered.
+ * operation. Its contents should not be altered.
*
* @return The set of requested attributes for this search
* operation.
diff --git a/opends/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java b/opends/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
index c645e43..42e40f0 100644
--- a/opends/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
+++ b/opends/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
@@ -146,7 +146,7 @@
/**
* Retrieves the set of requested attributes for this search
- * operation. Its contents should not be be altered.
+ * operation. Its contents should not be altered.
*
* @return The set of requested attributes for this search
* operation.
diff --git a/opends/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java b/opends/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
index 0c41fbf..7b3df52 100644
--- a/opends/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
+++ b/opends/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
@@ -146,7 +146,7 @@
/**
* Retrieves the set of requested attributes for this search
- * operation. Its contents should not be be altered.
+ * operation. Its contents should not be altered.
*
* @return The set of requested attributes for this search
* operation.
--
Gitblit v1.10.0