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/DSMLModifyDNOperation.java |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java b/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java
index cd8a830..bfd1184 100644
--- a/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java
+++ b/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java
@@ -84,17 +84,7 @@
     throws IOException, LDAPException, ASN1Exception
   {
     LDAPResult modDNResponse = objFactory.createLDAPResult();
-
-    String requestID = modifyDNRequest.getRequestID();
-    int reqID = 1;
-    try
-    {
-      reqID = Integer.parseInt(requestID);
-    } catch (NumberFormatException nfe)
-    {
-      throw new IOException(nfe.getMessage());
-    }
-    modDNResponse.setRequestID(requestID);
+    modDNResponse.setRequestID(modifyDNRequest.getRequestID());
 
     ASN1OctetString dnStr = new ASN1OctetString(modifyDNRequest.getDn());
 
@@ -114,7 +104,7 @@
     }
 
     // Create and send the LDAP request to the server.
-    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