You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2010/10/29 10:12:07 UTC
svn commit: r1028638 [4/7] - in /directory/shared/trunk:
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/re...
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java?rev=1028638&r1=1028637&r2=1028638&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java Fri Oct 29 08:12:05 2010
@@ -89,7 +89,7 @@ public abstract class AbstractGrammar im
*/
public GrammarTransition getTransition( Enum<?> state, int tag )
{
- return transitions[((States)state).getState()][tag & 0x00FF];
+ return transitions[state.ordinal()][tag & 0x00FF];
}
@@ -104,7 +104,6 @@ public abstract class AbstractGrammar im
{
Enum<?> currentState = container.getTransition();
- Grammar currentGrammar = container.getGrammar();
// We have to deal with the special case of a GRAMMAR_END state
if ( ((States)currentState).isEndState() )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/States.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/States.java?rev=1028638&r1=1028637&r2=1028638&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/States.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/States.java Fri Oct 29 08:12:05 2010
@@ -28,15 +28,6 @@ package org.apache.directory.shared.asn1
public interface States
{
/**
- * Get the string representing the state
- *
- * @param state The state number
- * @return The String representing the state
- */
- public int getState();
-
-
- /**
* @return True if this is the END_STATE
*/
public boolean isEndState();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java?rev=1028638&r1=1028637&r2=1028638&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java Fri Oct 29 08:12:05 2010
@@ -103,7 +103,7 @@ public class LdapMessageContainer extend
this.stateStack = new int[10];
this.grammar = LdapMessageGrammar.getInstance();
this.binaryAttributeDetector = binaryAttributeDetector;
- setTransition( LdapStatesEnum.INIT_GRAMMAR_STATE );
+ setTransition( LdapStatesEnum.START_STATE );
}