From 2a6a436cf43f43eeb25210a5c72301a932598d1c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 10:14:28 +0000
Subject: [PATCH] Partial OPENDJ-3106 Migrate Entry
---
opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
index 2f65fef..dfd45c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
@@ -26,7 +26,6 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -133,8 +132,7 @@
try
{
final Entry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
- addAllNonMonitorConfigAttributes(userAttrs, configEntry.getUserAttributes().values());
- addAllNonMonitorConfigAttributes(userAttrs, configEntry.getOperationalAttributes().values());
+ addAllNonMonitorConfigAttributes(userAttrs, configEntry.getAllAttributes());
}
catch (final Exception e)
{
@@ -153,16 +151,13 @@
return ccr;
}
- private void addAllNonMonitorConfigAttributes(final List<Attribute> userAttrs, Collection<List<Attribute>> attrbutes)
+ private void addAllNonMonitorConfigAttributes(List<Attribute> userAttrs, Iterable<Attribute> attributes)
{
- for (final List<Attribute> attrs : attrbutes)
+ for (final Attribute a : attributes)
{
- for (final Attribute a : attrs)
+ if (!isMonitorConfigAttribute(a))
{
- if (!isMonitorConfigAttribute(a))
- {
- userAttrs.add(a);
- }
+ userAttrs.add(a);
}
}
}
@@ -190,8 +185,7 @@
// attributes that we don't recognize will be included directly in the base
// monitor entry.
userDefinedAttributes = new ArrayList<>();
- addAll(userDefinedAttributes, configEntry.getUserAttributes().values());
- addAll(userDefinedAttributes, configEntry.getOperationalAttributes().values());
+ addAllNonMonitorConfigAttributes(userDefinedAttributes, configEntry.getAllAttributes());
// Construct the set of objectclasses to include in the base monitor entry.
monitorObjectClasses.put(CoreSchema.getTopObjectClass(), OC_TOP);
@@ -217,11 +211,6 @@
currentConfig = cfg;
}
- private void addAll(ArrayList<Attribute> attributes, Collection<List<Attribute>> attributesToAdd)
- {
- addAllNonMonitorConfigAttributes(attributes, attributesToAdd);
- }
-
@Override
public void createBackup(final BackupConfig backupConfig)
throws DirectoryException
--
Gitblit v1.10.0