From 143211dc9acc7ac6605844cc179315297537a796 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Fri, 22 Sep 2006 16:19:49 +0000
Subject: [PATCH] 1. Add test cases for task import from LDIF (tests are in the slow group). 2. Fix issue 702: Import of non-existent LDIF file leaves environment handle open. 3. In the test runner method TasksTestCase#testTask reduce the sleep from 1s to 10ms when polling for completed task. 4. Remove two unnecessary catch blocks in ImportTask.
---
opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java | 22 ++--------------------
1 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
index 9514373..269b406 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
@@ -252,15 +252,6 @@
message, msgID);
return TaskState.STOPPED_BY_ERROR;
}
- catch (Exception e)
- {
- int msgID = MSGID_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER;
- String message = getMessage(msgID, filterString,
- stackTraceToSingleLineString(e));
- logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
- message, msgID);
- return TaskState.STOPPED_BY_ERROR;
- }
}
ArrayList<SearchFilter> includeFilters =
@@ -280,15 +271,6 @@
message, msgID);
return TaskState.STOPPED_BY_ERROR;
}
- catch (Exception e)
- {
- int msgID = MSGID_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER;
- String message = getMessage(msgID, filterString,
- stackTraceToSingleLineString(e));
- logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
- message, msgID);
- return TaskState.STOPPED_BY_ERROR;
- }
}
@@ -354,7 +336,7 @@
for (String s : excludeBranchStrings)
{
- DN excludeBranch = null;
+ DN excludeBranch;
try
{
excludeBranch = DN.decode(s);
@@ -393,7 +375,7 @@
includeBranches = new ArrayList<DN>(includeBranchStrings.size());
for (String s : includeBranchStrings)
{
- DN includeBranch = null;
+ DN includeBranch;
try
{
includeBranch = DN.decode(s);
--
Gitblit v1.10.0