From df59285898b635c3c9f3011609eb7a73e779ecb9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 07 Feb 2014 10:10:50 +0000
Subject: [PATCH] OPENDJ-1307 Migrate server ASN1 classes to SDK
---
opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java b/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java
index d0deb88..4f814ba 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java
@@ -24,7 +24,6 @@
* Copyright 2007-2010 Sun Microsystems, Inc.
* Portions Copyright 2012-2014 ForgeRock AS
*/
-
package org.opends.server.tools.tasks;
import com.forgerock.opendj.cli.Argument;
@@ -38,7 +37,7 @@
import static org.opends.server.util.StaticUtils.getExceptionMessage;
import static org.opends.server.util.ServerConstants.MAX_LINE_WIDTH;
-import org.opends.server.protocols.asn1.ASN1Exception;
+import org.forgerock.opendj.ldap.DecodeException;
import org.opends.server.tools.LDAPConnection;
import org.opends.server.tools.LDAPConnectionException;
@@ -369,12 +368,12 @@
}
if (err != null) err.println(wrapText(message, MAX_LINE_WIDTH));
ret = 1;
- } catch (IOException ioe) {
- LocalizableMessage message = ERR_TASK_TOOL_IO_ERROR.get(ioe);
+ } catch (DecodeException ae) {
+ LocalizableMessage message = ERR_TASK_TOOL_DECODE_ERROR.get(ae.getMessage());
if (err != null) err.println(wrapText(message, MAX_LINE_WIDTH));
ret = 1;
- } catch (ASN1Exception ae) {
- LocalizableMessage message = ERR_TASK_TOOL_DECODE_ERROR.get(ae.getMessage());
+ } catch (IOException ioe) {
+ LocalizableMessage message = ERR_TASK_TOOL_IO_ERROR.get(ioe);
if (err != null) err.println(wrapText(message, MAX_LINE_WIDTH));
ret = 1;
} catch (LDAPException le) {
--
Gitblit v1.10.0