From 75be98e331a8f994665d6b9946499f94b7c53827 Mon Sep 17 00:00:00 2001
From: sin <sin@localhost>
Date: Thu, 24 Sep 2009 13:37:49 +0000
Subject: [PATCH] Fix for issue 4181: NPE in DSML search requests.
---
opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java b/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
index 171be52..73324d7 100644
--- a/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
+++ b/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.dsml.protocol;
@@ -280,8 +280,9 @@
{
subAnyElements.add(ByteString.valueOf(s));
}
- return LDAPFilter.createSubstringFilter(sf.getName(), ByteString.valueOf(sf
- .getInitial()), subAnyElements, ByteString.valueOf(sf.getFinal()));
+ return LDAPFilter.createSubstringFilter(sf.getName(), sf.getInitial()==null?
+ null:ByteString.valueOf(sf.getInitial()), subAnyElements,
+ sf.getFinal()==null?null:ByteString.valueOf(sf.getFinal()));
}
--
Gitblit v1.10.0