From 9d0dd93d1e6751e7642a45f74dcad83ba7eb029e Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 07 Jun 2010 09:22:42 +0000
Subject: [PATCH] Fix an issue with the replication repair commands. The control was looked at after some checks it was supposed to skip. This prevented some entries to be repared. The changes are also updating the unit tests making sure the Replication Repair control is properly tested.
---
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
index de6a48f..60e5fc3 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
@@ -203,15 +203,6 @@
break addProcessing;
}
- objectClasses = getObjectClasses();
- userAttributes = getUserAttributes();
- operationalAttributes = getOperationalAttributes();
-
- if ((objectClasses == null ) || (userAttributes == null) ||
- (operationalAttributes == null))
- {
- break addProcessing;
- }
// Check for a request to cancel this operation.
checkIfCanceled(false);
@@ -304,6 +295,16 @@
}
}
+ objectClasses = getObjectClasses();
+ userAttributes = getUserAttributes();
+ operationalAttributes = getOperationalAttributes();
+
+ if ((objectClasses == null ) || (userAttributes == null) ||
+ (operationalAttributes == null))
+ {
+ break addProcessing;
+ }
+
for (AttributeType at : userAttributes.keySet())
{
// If the attribute type is marked "NO-USER-MODIFICATION" then fail
--
Gitblit v1.10.0