From 410b7d0592ba0e1dc2f3d9c745523fee430bcabe Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 10 Jun 2011 10:25:31 +0000
Subject: [PATCH] Partial fix for OPENDJ-194: Minor improvements to change log content and configuration
---
opends/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java b/opends/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java
index b8a0d94..46db8f4 100644
--- a/opends/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -33,11 +34,9 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
-import org.opends.server.types.AttributeType;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.ResultCode;
-import java.util.HashSet;
/**
* This class specifies the external changelog feature for a replication
@@ -49,8 +48,8 @@
ConfigurationChangeListener<ExternalChangelogDomainCfg>
{
- LDAPReplicationDomain domain;
- boolean isEnabled;
+ private LDAPReplicationDomain domain;
+ private boolean isEnabled;
/**
* Constructor from a provided LDAPReplicationDomain.
@@ -60,16 +59,12 @@
public ExternalChangelogDomain(LDAPReplicationDomain domain,
ExternalChangelogDomainCfg configuration)
{
- this.domain =domain;
+ this.domain = domain;
this.isEnabled = configuration.isEnabled();
configuration.addChangeListener(this);
- if (configuration.getECLInclude() != null)
- {
- HashSet<String> attrNames = new HashSet<String>(0);
- for (AttributeType eclIncludeAttribute : configuration.getECLInclude())
- attrNames.add(eclIncludeAttribute.getNormalizedPrimaryName());
- domain.setEclInclude(domain.getServerId(), attrNames);
- }
+ domain.setEclIncludes(domain.getServerId(),
+ configuration.getECLInclude(),
+ configuration.getECLIncludeForDeletes());
}
@@ -95,10 +90,9 @@
}
this.isEnabled = configuration.isEnabled();
- HashSet<String> attrNames = new HashSet<String>(0);
- for (AttributeType eclInclude : configuration.getECLInclude())
- attrNames.add(eclInclude.getNormalizedPrimaryName());
- domain.setEclInclude(domain.getServerId(), attrNames);
+ domain.setEclIncludes(domain.getServerId(),
+ configuration.getECLInclude(),
+ configuration.getECLIncludeForDeletes());
return new ConfigChangeResult(ResultCode.SUCCESS, false);
}
@@ -126,10 +120,8 @@
}
this.isEnabled = configuration.isEnabled();
- HashSet<String> attrNames = new HashSet<String>(0);
- for (AttributeType eclInclude : configuration.getECLInclude())
- attrNames.add(eclInclude.getNormalizedPrimaryName());
- domain.changeConfig(attrNames);
+ domain.changeConfig(configuration.getECLInclude(),
+ configuration.getECLIncludeForDeletes());
return new ConfigChangeResult(ResultCode.SUCCESS, false);
}
catch (Exception e)
--
Gitblit v1.10.0