From fc649ad091ca53cbb9798ab193f0e36695abe825 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Wed, 09 May 2007 20:41:56 +0000
Subject: [PATCH] Update the DSML gateway so that it properly treats the request ID as an optional element rather than required. Also, update the DSML search processing code to be a little more forgiving when it comes to the search scope and deref policy strings.
---
opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java b/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java
index c581673..822b0ec 100644
--- a/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java
+++ b/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java
@@ -70,18 +70,8 @@
{
LDAPResult abandonResponse = objFactory.createLDAPResult();
- String requestID = abandonRequest.getRequestID();
- int reqID = 0;
- try
- {
- reqID = Integer.parseInt(requestID);
- } catch (NumberFormatException nfe)
- {
- throw new IOException(nfe.getMessage());
- }
-
// Set the id for the response.
- abandonResponse.setRequestID(requestID);
+ abandonResponse.setRequestID(abandonRequest.getRequestID());
String abandonIdStr = abandonRequest.getAbandonID();
int abandonId = 0;
@@ -95,7 +85,7 @@
// Create and send an LDAP request to the server.
ProtocolOp op = new AbandonRequestProtocolOp(abandonId);
- LDAPMessage msg = new LDAPMessage(reqID, op);
+ LDAPMessage msg = new LDAPMessage(DSMLServlet.nextMessageID(), op);
int numBytes = connection.getASN1Writer().writeElement(msg.encode());
return abandonResponse;
--
Gitblit v1.10.0