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 2005/10/15 17:34:29 UTC
svn commit: r321351 -
/directory/shared/ldap/trunk/apache2-provider/src/java/main/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java
Author: elecharny
Date: Sat Oct 15 08:34:25 2005
New Revision: 321351
URL: http://svn.apache.org/viewcvs?rev=321351&view=rev
Log:
Fixed a bug : when having no attributeValue, we got an invalid transition. The lacking transition has been added
Modified:
directory/shared/ldap/trunk/apache2-provider/src/java/main/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java
Modified: directory/shared/ldap/trunk/apache2-provider/src/java/main/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/java/main/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java?rev=321351&r1=321350&r2=321351&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/java/main/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/java/main/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java Sat Oct 15 08:34:25 2005
@@ -326,7 +326,8 @@
// ...
// Nothing to do
super.transitions[LdapStatesEnum.MODIFY_REQUEST_TYPE_TAG][UniversalTag.OCTET_STRING_TAG] = new GrammarTransition(
- LdapStatesEnum.MODIFY_REQUEST_TYPE_TAG, LdapStatesEnum.MODIFY_REQUEST_TYPE_VALUE,
+ LdapStatesEnum.MODIFY_REQUEST_TYPE_TAG,
+ LdapStatesEnum.MODIFY_REQUEST_TYPE_VALUE,
null );
// AttributeTypeAndValues ::= SEQUENCE {
@@ -334,7 +335,8 @@
// ...
// Store a new attribute type and values.
super.transitions[LdapStatesEnum.MODIFY_REQUEST_TYPE_VALUE][UniversalTag.OCTET_STRING_TAG] = new GrammarTransition(
- LdapStatesEnum.MODIFY_REQUEST_TYPE_VALUE, LdapStatesEnum.MODIFY_REQUEST_VALS_TAG,
+ LdapStatesEnum.MODIFY_REQUEST_TYPE_VALUE,
+ LdapStatesEnum.MODIFY_REQUEST_VALS_TAG,
new GrammarAction( "Store type" )
{
public void action( IAsn1Container container ) throws DecoderException
@@ -372,7 +374,7 @@
if ( log.isDebugEnabled() )
{
- log.debug( "Modification type : " + type );
+ log.debug( "Modifying type : " + type );
}
}
} );
@@ -382,7 +384,8 @@
// vals SET OF AttributeValue } (Tag)
// Nothing to do
super.transitions[LdapStatesEnum.MODIFY_REQUEST_VALS_TAG][UniversalTag.SET_TAG] = new GrammarTransition(
- LdapStatesEnum.MODIFY_REQUEST_VALS_TAG, LdapStatesEnum.MODIFY_REQUEST_VALS_VALUE,
+ LdapStatesEnum.MODIFY_REQUEST_VALS_TAG,
+ LdapStatesEnum.MODIFY_REQUEST_VALS_VALUE,
null );
// AttributeTypeAndValues ::= SEQUENCE {
@@ -392,6 +395,14 @@
super.transitions[LdapStatesEnum.MODIFY_REQUEST_VALS_VALUE][UniversalTag.SET_TAG] = new GrammarTransition(
LdapStatesEnum.MODIFY_REQUEST_VALS_VALUE,
LdapStatesEnum.MODIFY_REQUEST_ATTRIBUTE_VALUE_TAG, null );
+
+ // AttributeTypeAndValues ::= SEQUENCE {
+ // ...
+ // vals SET OF AttributeValue } (Value)
+ // Loop if the value is null.
+ super.transitions[LdapStatesEnum.MODIFY_REQUEST_ATTRIBUTE_VALUE_TAG][UniversalTag.SEQUENCE_TAG] = new GrammarTransition(
+ LdapStatesEnum.MODIFY_REQUEST_VALS_VALUE,
+ LdapStatesEnum.MODIFY_REQUEST_ATTRIBUTE_VALUE_OR_MODIFICATION_TAG, null );
// AttributeTypeAndValues ::= SEQUENCE {
// ...