From d782e4facdae0897de52f560e4ebbf30bd800318 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Tue, 15 Jun 2010 14:39:37 +0000
Subject: [PATCH] DN normalization enhancements:
---
sdk/src/org/opends/sdk/AVA.java | 36 +++++-------------------------------
1 files changed, 5 insertions(+), 31 deletions(-)
diff --git a/sdk/src/org/opends/sdk/AVA.java b/sdk/src/org/opends/sdk/AVA.java
index b6868ce..3949155 100644
--- a/sdk/src/org/opends/sdk/AVA.java
+++ b/sdk/src/org/opends/sdk/AVA.java
@@ -844,20 +844,6 @@
- StringBuilder toNormalizedString(final StringBuilder builder)
- {
- return toString(builder, true);
- }
-
-
-
- StringBuilder toString(final StringBuilder builder)
- {
- return toString(builder, false);
- }
-
-
-
private ByteString getNormalizeValue()
{
final MatchingRule matchingRule = attributeType.getEqualityMatchingRule();
@@ -877,41 +863,29 @@
- private StringBuilder toString(final StringBuilder builder,
- final boolean normalize)
+ StringBuilder toString(final StringBuilder builder)
{
- final ByteString value = normalize ? getNormalizeValue() : attributeValue;
-
if (!attributeType.getNames().iterator().hasNext())
{
builder.append(attributeType.getOID());
builder.append("=#");
- StaticUtils.toHex(value, builder);
+ StaticUtils.toHex(attributeValue, builder);
}
else
{
final String name = attributeType.getNameOrOID();
- if (normalize)
- {
- // Normalizing.
- StaticUtils.toLowerCase(name, builder);
- }
- else
- {
- builder.append(name);
- }
-
+ builder.append(name);
builder.append("=");
final Syntax syntax = attributeType.getSyntax();
if (!syntax.isHumanReadable())
{
builder.append("#");
- StaticUtils.toHex(value, builder);
+ StaticUtils.toHex(attributeValue, builder);
}
else
{
- final String str = value.toString();
+ final String str = attributeValue.toString();
if (str.length() == 0)
{
return builder;
--
Gitblit v1.10.0