From 7b0c543e99d6a93ec8ea3472eb0eb9fd8fac460e Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 09 Jun 2011 07:37:50 +0000
Subject: [PATCH] Partial fix OPENDJ-194: Minor improvements to change log content and configuration
---
opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java | 62 -------------------------------
1 files changed, 0 insertions(+), 62 deletions(-)
diff --git a/opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java b/opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
index c195824..9625ac4 100644
--- a/opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
@@ -1192,42 +1192,6 @@
operationalAttrs.put(aType, attrList);
else
uAttrs.put(aType, attrList);
-
- if (draftChangenumber>0)
- {
- // compat mode
- if((aType = DirectoryServer.getAttributeType("targetuniqueid")) == null)
- aType = DirectoryServer.getDefaultAttributeType("targetUniqueID");
- String dseeValue = null;
- try
- {
- dseeValue = ECLSearchOperation.openDsToSunDseeNsUniqueId(targetUUID);
- }
- catch(Exception e)
- {
- Message errMessage =
- NOTE_ERR_ENTRY_UID_DSEE_MAPPING.get(
- targetDN.toNormalizedString(),
- targetUUID,
- e.getLocalizedMessage());
- logError(errMessage);
- if (debugEnabled())
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- // If the mapping fails, we don't want to stop the operation
- // or not return this entry.
- if (dseeValue != null)
- {
- a = Attributes.create(aType, dseeValue);
- attrList = new ArrayList<Attribute>(1);
- attrList.add(a);
- if(aType.isOperational())
- operationalAttrs.put(aType, attrList);
- else
- uAttrs.put(aType, attrList);
- }
- }
}
if((aType = DirectoryServer.getAttributeType("changelogcookie")) == null)
@@ -1314,32 +1278,6 @@
}
/**
- * The unique identifier used in DSEE is named nsUniqueId and its format is
- * HHHHHHHH-HHHHHHHH-HHHHHHHH-HHHHHHHH where H is a hex digit.
- * An nsUniqueId value is for example 3970de28-08b311d9-8095b9bf-c4d9231c
- * The unique identifier used in OpenDS is named entryUUID.
- * Its value is for example entryUUID: 50dd9673-71e1-4478-b13c-dba387c4d7e1
- * @param entryUid the OpenDS entry UID
- * @return the Dsee format for the entry UID
- */
- private static String openDsToSunDseeNsUniqueId(String entryUid)
- {
- // the conversion from one unique identifier to an other is
- // a question of formating : the last "-" is placed
- StringBuilder buffer = new StringBuilder(entryUid);
- // Delete a "-" at 13 to get something like
- buffer.deleteCharAt(13);
-
- // Delete a "-" at 23 to get something like
- buffer.deleteCharAt(22);
-
- // Add the last "-" to get something like
- buffer.insert(26,'-');
-
- return buffer.toString();
- }
-
- /**
* Traverse the provided search filter, looking for some conditions
* on attributes that can be optimized in the ECL.
* When found, populate the provided StartECLSessionMsg.
--
Gitblit v1.10.0