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/DSMLCompareOperation.java | 22 ++--------------------
1 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java b/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
index 1ded6cb..303e36c 100644
--- a/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
+++ b/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
@@ -83,25 +83,7 @@
throws IOException, LDAPException, ASN1Exception
{
LDAPResult compareResponse = objFactory.createLDAPResult();
-
- String requestID = compareRequest.getRequestID();
- int reqID = 1;
- try
- {
- if(requestID != null)
- {
- reqID = Integer.parseInt(requestID);
- }
- } catch (NumberFormatException nfe)
- {
- throw new IOException(nfe.getMessage());
- }
-
- // Set the response id.
- if(requestID != null)
- {
- compareResponse.setRequestID(requestID);
- }
+ compareResponse.setRequestID(compareRequest.getRequestID());
// Read the attribute name and value for the compare request.
AttributeValueAssertion attrValAssertion = compareRequest.getAssertion();
@@ -113,7 +95,7 @@
// Create and send the LDAP compare request to the server.
ProtocolOp op = new CompareRequestProtocolOp(dnStr, attrName, attrValue);
- LDAPMessage msg = new LDAPMessage(reqID, op);
+ LDAPMessage msg = new LDAPMessage(DSMLServlet.nextMessageID(), op);
int numBytes = connection.getASN1Writer().writeElement(msg.encode());
// Read and decode the LDAP response from the server.
--
Gitblit v1.10.0