From 79b017514ce3dd6a0885f3fef94b6f698fc25b58 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 25 Jun 2010 10:47:10 +0000
Subject: [PATCH] Fixes an issue with the way the historical information (meta-data) is generated for Add operations through replication.
---
opends/src/server/org/opends/server/replication/protocol/AddMsg.java | 13 ++++++++-----
opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java | 2 ++
opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 1 -
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index b52a8f1..fd23888 100644
--- a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -2280,7 +2280,6 @@
findEntryId(addOperation.getEntryDN().getParentDNInSuffix()));
addOperation.setAttachment(SYNCHROCONTEXT, ctx);
- Historical.generateState(addOperation);
}
/**
diff --git a/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java b/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
index 921d86e..92c628a 100644
--- a/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -574,6 +574,8 @@
if (!addOperation.isSynchronizationOperation())
domain.doPreOperation(addOperation);
+ Historical.generateState(addOperation);
+
return new SynchronizationProviderResult.ContinueProcessing();
}
diff --git a/opends/src/server/org/opends/server/replication/protocol/AddMsg.java b/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
index d4feb34..99da1b8 100644
--- a/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.replication.protocol;
@@ -42,6 +42,7 @@
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.plugin.Historical;
import org.opends.server.types.*;
import org.opends.server.types.operation.PostOperationAddOperation;
@@ -344,8 +345,9 @@
{
for (Attribute a : list)
{
- if (!a.isVirtual())
- new LDAPAttribute(a).write(writer);
+ if (!Historical.isHistoricalAttribute(a))
+ if (!a.isVirtual())
+ new LDAPAttribute(a).write(writer);
}
}
@@ -354,8 +356,9 @@
{
for (Attribute a : list)
{
- if (!a.isVirtual())
- new LDAPAttribute(a).write(writer);
+ if (!Historical.isHistoricalAttribute(a))
+ if (!a.isVirtual())
+ new LDAPAttribute(a).write(writer);
}
}
}
--
Gitblit v1.10.0