You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2022/09/02 15:02:38 UTC
[directory-ldap-api] branch master updated (cf01a8e4a -> 61ff0b8a8)
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
from cf01a8e4a [maven-release-plugin] prepare for next development iteration
new 6e9f1a98d Fix DIRAPI-386
new 61ff0b8a8 Fix DIRAPI-386
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/resources/org/apache/directory/api/i18n/errors.properties | 2 +-
.../apache/directory/api/ldap/model/message/SearchRequestImpl.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
[directory-ldap-api] 01/02: Fix DIRAPI-386
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
commit 6e9f1a98d638b528c3cbb2ad71ef87f488b0dfe5
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Fri Sep 2 17:01:09 2022 +0200
Fix DIRAPI-386
---
.../apache/directory/api/ldap/model/message/SearchRequestImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java
index 32fba97bf..d8462f228 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java
@@ -28,7 +28,7 @@ import java.util.List;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.api.ldap.model.exception.LdapProtocolErrorException;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidSearchFilterException;
import org.apache.directory.api.ldap.model.filter.BranchNormalizedVisitor;
import org.apache.directory.api.ldap.model.filter.ExprNode;
import org.apache.directory.api.ldap.model.filter.FilterParser;
@@ -181,7 +181,7 @@ public class SearchRequestImpl extends AbstractAbandonableRequest implements Sea
}
catch ( ParseException pe )
{
- throw new LdapProtocolErrorException( I18n.err( I18n.ERR_13508_INVALID_FILTER, filter ), pe );
+ throw new LdapInvalidSearchFilterException( I18n.err( I18n.ERR_13508_INVALID_FILTER, filter, pe.getMessage() ) );
}
return this;
[directory-ldap-api] 02/02: Fix DIRAPI-386
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
commit 61ff0b8a89a1bd9caad52e49ac18df264e43067e
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Fri Sep 2 17:01:34 2022 +0200
Fix DIRAPI-386
---
i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties b/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
index b52b9f057..c3baa7fca 100644
--- a/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
+++ b/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
@@ -639,7 +639,7 @@ ERR_13504_FIX_OID=the OID is fixed: {0}
ERR_13505_HARDCODED_ZERO_LENGTH_RESPONSE=the response is hardcoded as zero length array
ERR_13506_CANNOT_ABANDON_OPERATION=RFC 2251 [Section 4.11]: Abandon, Bind, Unbind, and StartTLS operations cannot be abandoned.
ERR_13507_UNRECOGNIZED_JNDI_PROPERTY_VALUE=Unrecognized value ''{0}'' for {1} JNDI property.\nExpected a value of either always, never, searching, or finding.
-ERR_13508_INVALID_FILTER=The filter {0} is invalid.
+ERR_13508_INVALID_FILTER=The filter {0} is invalid: {1}.
ERR_13509_UNEXPECTED_SCOPE=Unexpected scope {0}
ERR_13510_UNKNOWN_DEREF_MODE=Unknown derefmode {0}
ERR_13511_INVALID_PROXIED_AUTHZ_NULL=Invalid proxied authz value: cannot be null