From 449c6860649a0c135d1a3a2ca9351275f6282c51 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Fri, 25 Apr 2008 20:02:34 +0000
Subject: [PATCH] Remove confusing startup information messages.
---
opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java | 6 --
opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java | 88 ++++++++++++++++++++------------------------
2 files changed, 41 insertions(+), 53 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
index 6dcea1a..3ed65df 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -233,27 +233,23 @@
* the global ACIs from the configuration entry.
*/
private void processGlobalAcis(
- DseeCompatAccessControlHandlerCfg configuration)
- throws InitializationException {
- SortedSet<Aci> globalAcis = configuration.getGlobalACI();
- try {
- if (globalAcis != null) {
- aciList.addAci(DN.nullDN(),globalAcis);
- Message message = INFO_ACI_ADD_LIST_GLOBAL_ACIS.get(
- Integer.toString(globalAcis.size()));
- logError(message);
- } else {
- Message message = INFO_ACI_ADD_LIST_NO_GLOBAL_ACIS.get();
- logError(message);
-
- }
- } catch (Exception e) {
- if (debugEnabled())
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- Message message = INFO_ACI_HANDLER_FAIL_PROCESS_GLOBAL_ACI.
- get(String.valueOf(configuration.dn()));
- throw new InitializationException(message, e);
+ DseeCompatAccessControlHandlerCfg configuration)
+ throws InitializationException {
+ SortedSet<Aci> globalAcis = configuration.getGlobalACI();
+ try {
+ if (globalAcis != null) {
+ aciList.addAci(DN.nullDN(),globalAcis);
+ Message message = INFO_ACI_ADD_LIST_GLOBAL_ACIS.get(
+ Integer.toString(globalAcis.size()));
+ logError(message);
}
+ } catch (Exception e) {
+ if (debugEnabled())
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ Message message = INFO_ACI_HANDLER_FAIL_PROCESS_GLOBAL_ACI.
+ get(String.valueOf(configuration.dn()));
+ throw new InitializationException(message, e);
+ }
}
/**
@@ -266,35 +262,31 @@
* the ACIs in the naming context.
*/
private void processConfigAcis() throws InitializationException {
- try
- {
- DN configDN=DN.decode("cn=config");
- LinkedHashSet<String> attrs = new LinkedHashSet<String>(1);
- attrs.add("aci");
- LinkedList<Message>failedACIMsgs=new LinkedList<Message>();
- InternalClientConnection conn =
- InternalClientConnection.getRootConnection();
- InternalSearchOperation op = conn.processSearch(configDN,
- SearchScope.WHOLE_SUBTREE,
- DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
- SearchFilter.createFilterFromString("aci=*"), attrs);
- if(op.getSearchEntries().isEmpty()) {
- Message message =
- INFO_ACI_ADD_LIST_NO_ACIS.get(String.valueOf(configDN));
- logError(message);
- } else {
- int validAcis =
- aciList.addAci(op.getSearchEntries(), failedACIMsgs);
- if(!failedACIMsgs.isEmpty())
- aciListenerMgr.logMsgsSetLockDownMode(failedACIMsgs);
- Message message = INFO_ACI_ADD_LIST_ACIS.get(
- Integer.toString(validAcis), String.valueOf(configDN));
- logError(message);
- }
- } catch (DirectoryException e) {
- Message message = INFO_ACI_HANDLER_FAIL_PROCESS_ACI.get();
- throw new InitializationException(message, e);
+ try
+ {
+ DN configDN=DN.decode("cn=config");
+ LinkedHashSet<String> attrs = new LinkedHashSet<String>(1);
+ attrs.add("aci");
+ LinkedList<Message>failedACIMsgs=new LinkedList<Message>();
+ InternalClientConnection conn =
+ InternalClientConnection.getRootConnection();
+ InternalSearchOperation op = conn.processSearch(configDN,
+ SearchScope.WHOLE_SUBTREE,
+ DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
+ SearchFilter.createFilterFromString("aci=*"), attrs);
+ if(!op.getSearchEntries().isEmpty()) {
+ int validAcis =
+ aciList.addAci(op.getSearchEntries(), failedACIMsgs);
+ if(!failedACIMsgs.isEmpty())
+ aciListenerMgr.logMsgsSetLockDownMode(failedACIMsgs);
+ Message message = INFO_ACI_ADD_LIST_ACIS.get(
+ Integer.toString(validAcis), String.valueOf(configDN));
+ logError(message);
}
+ } catch (DirectoryException e) {
+ Message message = INFO_ACI_HANDLER_FAIL_PROCESS_ACI.get();
+ throw new InitializationException(message, e);
+ }
}
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java b/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
index 2fc9dcf..96f95dc 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
@@ -271,11 +271,7 @@
}
continue;
}
- if(internalSearch.getSearchEntries().isEmpty()) {
- Message message =
- INFO_ACI_ADD_LIST_NO_ACIS.get(String.valueOf(baseDN));
- logError(message);
- } else {
+ if(!internalSearch.getSearchEntries().isEmpty()) {
int validAcis = aciList.addAci(
internalSearch.getSearchEntries(), failedACIMsgs);
if(!failedACIMsgs.isEmpty())
--
Gitblit v1.10.0