From fbda6e0892dcfcc8dd43d21f6fb134aabb8d0cac Mon Sep 17 00:00:00 2001
From: jarnou <jarnou@localhost>
Date: Tue, 03 Jul 2007 09:29:17 +0000
Subject: [PATCH] Commits the refactoring of the core server to provide support for proxy/distribution/virtual functionnalities. This includes the new set of local operations, as well as the workflow and networkgroup support.
---
opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java b/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
index 4978266..5cd4053 100644
--- a/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
+++ b/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
@@ -32,13 +32,13 @@
import org.opends.server.api.DirectoryThread;
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;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
-import org.opends.server.types.Operation;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
@@ -72,7 +72,7 @@
private boolean waitingForWork;
// The operation that this worker thread is currently processing.
- private Operation operation;
+ private AbstractOperation operation;
// The handle to the actual thread for this worker thread.
private Thread workerThread;
@@ -221,8 +221,9 @@
String.valueOf(operation),
stackTraceToSingleLineString(e));
- operation.disconnectClient(DisconnectReason.SERVER_ERROR, true,
- message, msgID);
+ operation.disconnectClient(
+ DisconnectReason.SERVER_ERROR,
+ true, message, msgID);
}
catch (Exception e2)
{
--
Gitblit v1.10.0