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/extensions/ConfigFileHandler.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
index e2abe0c..711145c 100644
--- a/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -73,7 +73,6 @@
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.tools.LDIFModify;
import org.opends.server.types.*;
@@ -864,7 +863,7 @@
{
try
{
- ASN1OctetString ts = new ASN1OctetString(name.substring(7, dotPos));
+ ByteString ts = ByteString.valueOf(name.substring(7, dotPos));
long timestamp = GeneralizedTimeSyntax.decodeGeneralizedTimeValue(ts);
if (timestamp > latestTimestamp)
{
@@ -883,7 +882,7 @@
{
try
{
- ASN1OctetString ts = new ASN1OctetString(name.substring(7, dashPos));
+ ByteString ts = ByteString.valueOf(name.substring(7, dashPos));
long timestamp = GeneralizedTimeSyntax.decodeGeneralizedTimeValue(ts);
int counter = Integer.parseInt(name.substring(dashPos+1, dotPos));
--
Gitblit v1.10.0