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 2006/08/28 09:16:59 UTC
svn commit: r437584 - in
/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec:
add/ compare/ del/ modify/ modifyDn/ search/
Author: elecharny
Date: Mon Aug 28 00:16:58 2006
New Revision: 437584
URL: http://svn.apache.org/viewvc?rev=437584&view=rev
Log:
Changed the call to the ResponseCaryingException accordingly
to the constructor modification
Modified:
directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestGrammar.java
directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestGrammar.java
directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestGrammar.java
directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestGrammar.java
directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestGrammar.java
directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestGrammar.java
Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestGrammar.java
URL: http://svn.apache.org/viewvc/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestGrammar.java?rev=437584&r1=437583&r2=437584&view=diff
==============================================================================
--- directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestGrammar.java (original)
+++ directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestGrammar.java Mon Aug 28 00:16:58 2006
@@ -166,16 +166,8 @@
") is invalid";
log.error( "{} : {}", msg, ine.getMessage() );
- AddResponseImpl message = new AddResponseImpl( ldapMessage.getMessageId() );
- message.getLdapResult().setErrorMessage( msg );
- message.getLdapResult().setResultCode( ResultCodeEnum.INVALIDDNSYNTAX );
- message.getLdapResult().setMatchedDn( LdapDN.EMPTY_LDAPDN );
-
- ResponseCarryingException exception = new ResponseCarryingException( msg, ine );
-
- exception.setResponse( message );
-
- throw exception;
+ AddResponseImpl response = new AddResponseImpl( ldapMessage.getMessageId() );
+ throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALIDDNSYNTAX, LdapDN.EMPTY_LDAPDN, ine );
}
addRequest.setEntry( entry );
Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestGrammar.java
URL: http://svn.apache.org/viewvc/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestGrammar.java?rev=437584&r1=437583&r2=437584&view=diff
==============================================================================
--- directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestGrammar.java (original)
+++ directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestGrammar.java Mon Aug 28 00:16:58 2006
@@ -156,16 +156,8 @@
") is invalid";
log.error( "{} : {}", msg, ine.getMessage() );
- CompareResponseImpl message = new CompareResponseImpl( ldapMessage.getMessageId() );
- message.getLdapResult().setErrorMessage( msg );
- message.getLdapResult().setResultCode( ResultCodeEnum.INVALIDDNSYNTAX );
- message.getLdapResult().setMatchedDn( LdapDN.EMPTY_LDAPDN );
-
- ResponseCarryingException exception = new ResponseCarryingException( msg, ine );
-
- exception.setResponse( message );
-
- throw exception;
+ CompareResponseImpl response = new CompareResponseImpl( ldapMessage.getMessageId() );
+ throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALIDDNSYNTAX, LdapDN.EMPTY_LDAPDN, ine );
}
compareRequest.setEntry( entry );
Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestGrammar.java
URL: http://svn.apache.org/viewvc/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestGrammar.java?rev=437584&r1=437583&r2=437584&view=diff
==============================================================================
--- directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestGrammar.java (original)
+++ directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestGrammar.java Mon Aug 28 00:16:58 2006
@@ -127,16 +127,8 @@
+ ") is invalid";
log.error( "{} : {}", msg, ine.getMessage() );
- DeleteResponseImpl message = new DeleteResponseImpl( ldapMessage.getMessageId() );
- message.getLdapResult().setErrorMessage( msg );
- message.getLdapResult().setResultCode( ResultCodeEnum.INVALIDDNSYNTAX );
- message.getLdapResult().setMatchedDn( LdapDN.EMPTY_LDAPDN );
-
- ResponseCarryingException exception = new ResponseCarryingException( msg, ine );
-
- exception.setResponse( message );
-
- throw exception;
+ DeleteResponseImpl response = new DeleteResponseImpl( ldapMessage.getMessageId() );
+ throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALIDDNSYNTAX, LdapDN.EMPTY_LDAPDN, ine );
}
delRequest.setEntry( entry );
Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestGrammar.java
URL: http://svn.apache.org/viewvc/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestGrammar.java?rev=437584&r1=437583&r2=437584&view=diff
==============================================================================
--- directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestGrammar.java (original)
+++ directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestGrammar.java Mon Aug 28 00:16:58 2006
@@ -159,16 +159,8 @@
") is invalid";
log.error( "{} : {}", msg, ine.getMessage() );
- ModifyResponseImpl message = new ModifyResponseImpl( ldapMessage.getMessageId() );
- message.getLdapResult().setErrorMessage( msg );
- message.getLdapResult().setResultCode( ResultCodeEnum.INVALIDDNSYNTAX );
- message.getLdapResult().setMatchedDn( LdapDN.EMPTY_LDAPDN );
-
- ResponseCarryingException exception = new ResponseCarryingException( msg, ine );
-
- exception.setResponse( message );
-
- throw exception;
+ ModifyResponseImpl response = new ModifyResponseImpl( ldapMessage.getMessageId() );
+ throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALIDDNSYNTAX, LdapDN.EMPTY_LDAPDN, ine );
}
modifyRequest.setObject( object );
Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestGrammar.java
URL: http://svn.apache.org/viewvc/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestGrammar.java?rev=437584&r1=437583&r2=437584&view=diff
==============================================================================
--- directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestGrammar.java (original)
+++ directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestGrammar.java Mon Aug 28 00:16:58 2006
@@ -160,16 +160,8 @@
") is invalid";
log.error( "{} : {}", msg, ine.getMessage() );
- ModifyDnResponseImpl message = new ModifyDnResponseImpl( ldapMessage.getMessageId() );
- message.getLdapResult().setErrorMessage( msg );
- message.getLdapResult().setResultCode( ResultCodeEnum.INVALIDDNSYNTAX );
- message.getLdapResult().setMatchedDn( LdapDN.EMPTY_LDAPDN );
-
- ResponseCarryingException exception = new ResponseCarryingException( msg, ine );
-
- exception.setResponse( message );
-
- throw exception;
+ ModifyDnResponseImpl response = new ModifyDnResponseImpl( ldapMessage.getMessageId() );
+ throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALIDDNSYNTAX, LdapDN.EMPTY_LDAPDN, ine );
}
modifyDNRequest.setEntry( entry );
@@ -239,16 +231,8 @@
") is invalid";
log.error( "{} : {}", msg, ine.getMessage() );
- ModifyDnResponseImpl message = new ModifyDnResponseImpl( ldapMessage.getMessageId() );
- message.getLdapResult().setErrorMessage( msg );
- message.getLdapResult().setResultCode( ResultCodeEnum.INVALIDDNSYNTAX );
- message.getLdapResult().setMatchedDn( LdapDN.EMPTY_LDAPDN );
-
- ResponseCarryingException exception = new ResponseCarryingException( msg, ine );
-
- exception.setResponse( message );
-
- throw exception;
+ ModifyDnResponseImpl response = new ModifyDnResponseImpl( ldapMessage.getMessageId() );
+ throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALIDDNSYNTAX, LdapDN.EMPTY_LDAPDN, ine );
}
modifyDNRequest.setNewRDN( newRdn );
@@ -394,16 +378,8 @@
") is invalid";
log.error( "{} : {}", msg, ine.getMessage() );
- ModifyDnResponseImpl message = new ModifyDnResponseImpl( ldapMessage.getMessageId() );
- message.getLdapResult().setErrorMessage( msg );
- message.getLdapResult().setResultCode( ResultCodeEnum.INVALIDDNSYNTAX );
- message.getLdapResult().setMatchedDn( LdapDN.EMPTY_LDAPDN );
-
- ResponseCarryingException exception = new ResponseCarryingException( msg, ine );
-
- exception.setResponse( message );
-
- throw exception;
+ ModifyDnResponseImpl response = new ModifyDnResponseImpl( ldapMessage.getMessageId() );
+ throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALIDDNSYNTAX, LdapDN.EMPTY_LDAPDN, ine );
}
modifyDNRequest.setNewSuperior( newSuperior );
Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestGrammar.java
URL: http://svn.apache.org/viewvc/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestGrammar.java?rev=437584&r1=437583&r2=437584&view=diff
==============================================================================
--- directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestGrammar.java (original)
+++ directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestGrammar.java Mon Aug 28 00:16:58 2006
@@ -162,16 +162,8 @@
") is invalid";
log.error( "{} : {}", msg, ine.getMessage() );
- SearchResponseDoneImpl message = new SearchResponseDoneImpl( ldapMessage.getMessageId() );
- message.getLdapResult().setErrorMessage( msg );
- message.getLdapResult().setResultCode( ResultCodeEnum.INVALIDDNSYNTAX );
- message.getLdapResult().setMatchedDn( LdapDN.EMPTY_LDAPDN );
-
- ResponseCarryingException exception = new ResponseCarryingException( msg, ine );
-
- exception.setResponse( message );
-
- throw exception;
+ SearchResponseDoneImpl response = new SearchResponseDoneImpl( ldapMessage.getMessageId() );
+ throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALIDDNSYNTAX, LdapDN.EMPTY_LDAPDN, ine );
}
}