From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java | 24 ++----------------------
1 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java b/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
index 5af2c91..8a814bc 100644
--- a/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
+++ b/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
@@ -37,13 +37,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeBuilder;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.DebugLogLevel;
-import org.opends.server.types.InitializationException;
+import org.opends.server.types.*;
import org.opends.server.util.DynamicConstants;
@@ -280,23 +274,9 @@
{
AttributeType attrType = DirectoryServer.getDefaultAttributeType(name);
- ASN1OctetString encodedValue = new ASN1OctetString(value);
AttributeBuilder builder = new AttributeBuilder(attrType);
- try
- {
- builder.add(new AttributeValue(encodedValue,
- attrType.normalize(encodedValue)));
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- builder.add(new AttributeValue(encodedValue, encodedValue));
- }
+ builder.add(AttributeValues.create(attrType, value));
return builder.toAttribute();
}
--
Gitblit v1.10.0