From d7983b7e6eef579bc5f86cefa6932fecc7aec7bd Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Tue, 04 Sep 2007 16:01:28 +0000
Subject: [PATCH] entry cache cleanup: - remove obsolete methods, fields and messages. - aggregate filters evaluation for config phases. - simplify filters evaluation and error reporting. - use a single set of filter messages.
---
opends/src/server/org/opends/server/extensions/EntryCacheCommon.java | 41 ++++++++---------------------------------
1 files changed, 8 insertions(+), 33 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java b/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java
index e7641c3..52ab40a 100644
--- a/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java
+++ b/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java
@@ -281,12 +281,8 @@
*
* @param filters the list of string filter to convert to search filters
* @param decodeErrorMsg the error message ID to use in case of error
- * @param errorHandler an handler used to report errors
- * during decoding of filter
- * @param noFilterMsg the error message ID to use when none of the
- * filters was decoded properly
- * @param configEntryDN the DN of the configuration entry for the
- * entry cache
+ * @param errorHandler error handler to report filter decoding errors on
+ * @param configEntryDN the entry cache configuration DN
*
* @return the set of search filters
*/
@@ -294,8 +290,6 @@
SortedSet<String> filters,
MessageDescriptor.Arg3<CharSequence, CharSequence, CharSequence>
decodeErrorMsg,
- MessageDescriptor.Arg1<CharSequence>
- noFilterMsg,
ConfigErrorHandler errorHandler,
DN configEntryDN
)
@@ -314,31 +308,12 @@
}
catch (DirectoryException de)
{
- // We couldn't decode this filter. Log a warning and continue.
- errorHandler.reportError(
- decodeErrorMsg.get(
- String.valueOf(configEntryDN),
- curFilter,
- stackTraceToSingleLineString(de)),
- false,
- ResultCode.INVALID_ATTRIBUTE_SYNTAX
- );
- }
- }
-
- // If none of the filters was decoded properly log an error message
- // (only if we are in initialize phase).
- if ((errorHandler.getConfigPhase() == ConfigPhase.PHASE_INIT)
- && searchFilters.isEmpty())
- {
- if (noFilterMsg != null) {
- errorHandler.reportError(
- noFilterMsg.get(String.valueOf(configEntryDN)),
- false, null);
- } else {
- errorHandler.reportError( // TODO: i18n
- Message.raw("No filter provided: %s", configEntryDN),
- false, null);
+ // We couldn't decode this filter. Report an error and continue.
+ Message message = decodeErrorMsg.get(String.valueOf(configEntryDN),
+ curFilter, (de.getMessage() != null ? de.getMessage() :
+ stackTraceToSingleLineString(de)));
+ errorHandler.reportError(message, false,
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX);
}
}
}
--
Gitblit v1.10.0