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/protocols/jmx/JmxClientConnection.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java b/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
index bd282b3..67c2fd6 100644
--- a/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
+++ b/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
@@ -43,6 +43,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation ;
import org.opends.server.protocols.internal.InternalSearchListener;
+import org.opends.server.types.AbstractOperation;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.AuthenticationInfo;
import org.opends.server.types.CancelRequest;
@@ -88,7 +89,7 @@
private ConnectionSecurityProvider securityProvider;
// The empty operation list for this connection.
- private LinkedList<Operation> operationList;
+ private LinkedList<AbstractOperation> operationList;
// The connection ID for this client connection.
private long connectionID;
@@ -142,7 +143,7 @@
true,
MSGID_LDAP_CONNHANDLER_REJECTED_BY_SERVER);
}
- operationList = new LinkedList<Operation>();
+ operationList = new LinkedList<AbstractOperation>();
try
{
@@ -468,11 +469,11 @@
* @return A reference to the add operation that was processed and contains
* information about the result of the processing.
*/
- public AddOperation processAdd(ASN1OctetString rawEntryDN,
+ public AddOperationBasis processAdd(ASN1OctetString rawEntryDN,
ArrayList<RawAttribute> rawAttributes)
{
- AddOperation addOperation =
- new AddOperation(this, nextOperationID(), nextMessageID(),
+ AddOperationBasis addOperation =
+ new AddOperationBasis(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawEntryDN, rawAttributes);
addOperation.run();
@@ -514,10 +515,10 @@
* @return A reference to the delete operation that was processed and
* contains information about the result of the processing.
*/
- public DeleteOperation processDelete(ASN1OctetString rawEntryDN)
+ public DeleteOperationBasis processDelete(ASN1OctetString rawEntryDN)
{
- DeleteOperation deleteOperation =
- new DeleteOperation(this, nextOperationID(), nextMessageID(),
+ DeleteOperationBasis deleteOperation =
+ new DeleteOperationBasis(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawEntryDN);
deleteOperation.run();
@@ -560,11 +561,11 @@
* @return A reference to the modify operation that was processed and
* contains information about the result of the processing
*/
- public ModifyOperation processModify(ASN1OctetString rawEntryDN,
+ public ModifyOperationBasis processModify(ASN1OctetString rawEntryDN,
ArrayList<RawModification> rawModifications)
{
- ModifyOperation modifyOperation =
- new ModifyOperation(this, nextOperationID(), nextMessageID(),
+ ModifyOperationBasis modifyOperation =
+ new ModifyOperationBasis(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawEntryDN,
rawModifications);
@@ -714,8 +715,6 @@
typesOnly, filter, attributes,
searchListener);
-
-
searchOperation.run();
return searchOperation;
}
@@ -826,6 +825,7 @@
{
UnbindOperation unbindOp = new UnbindOperation((ClientConnection) this,
this.nextOperationID(), this.nextMessageID(), null);
+
unbindOp.run();
}
catch (Exception e)
@@ -894,7 +894,7 @@
*
* @return The set of operations in progress for this client connection.
*/
- public Collection<Operation> getOperationsInProgress()
+ public Collection<AbstractOperation> getOperationsInProgress()
{
return operationList;
}
@@ -909,7 +909,7 @@
* @return The operation in progress with the specified message ID, or
* <CODE>null</CODE> if no such operation could be found.
*/
- public Operation getOperationInProgress(int messageID)
+ public AbstractOperation getOperationInProgress(int messageID)
{
// Jmx operations will not be tracked.
return null;
--
Gitblit v1.10.0