From 35a408038c1de64a6f13f0e7b246a645e9945e3c Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Tue, 18 Mar 2008 22:44:58 +0000
Subject: [PATCH] With this refactoring:
---
opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java b/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
index 1cff4ff..d7c164f 100644
--- a/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
+++ b/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
@@ -35,7 +35,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AbstractOperation;
import org.opends.server.types.CancelRequest;
-import org.opends.server.types.CancelResult;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DisconnectReason;
@@ -159,19 +158,9 @@
else
{
// The operation is not null, so process it. Make sure that when
- // processing is complete the cancel status is properly set.
- try
- {
- operation.run();
- operation.operationCompleted();
- }
- finally
- {
- if (operation.getCancelResult() == null)
- {
- operation.setCancelResult(CancelResult.TOO_LATE);
- }
- }
+ // processing is complete.
+ operation.run();
+ operation.operationCompleted();
}
}
catch (Throwable t)
--
Gitblit v1.10.0