directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r503333 - in /directory/shared/branches/0.9.5: asn1/src/main/java/org/apache/directory/shared/asn1/ asn1/src/main/java/org/apache/directory/shared/asn1/ber/ asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/ ldap/src/main/java/org...
Date Sat, 03 Feb 2007 23:13:53 GMT
Author: elecharny
Date: Sat Feb  3 15:13:50 2007
New Revision: 503333

URL: http://svn.apache.org/viewvc?view=rev&rev=503333
Log:
Fixed DIRSERVER-823.

The problem was hidden in the way we handled the filter tree. It was supposed that when a filter has been
completly parsed, and if it's parent TLV expected length was 0, then the parent filter was considered as completed too.
But the fact is that we may have had some cases (like with substrings) where the parent TLV has an expected Length 
equals to 0 but this parent TLV was itself included in another parent TLV, representing the parent filter.

So we unfolded two filters instead of only one, and associated the completed filter to the wrong parent.

Now, an TLV id has been created, associated to each TLV in a container, and the unfolding is done comparing 
those ids.

More doco about this complex algorithm to come on confluence ...

Modified:
    directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/Asn1Object.java
    directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java
    directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java
    directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java
    directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessage.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponse.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ManageDsaITControl.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequest.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddResponse.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/LdapAuthentication.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SaslCredentials.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SimpleAuthentication.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelResponse.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequest.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulAction.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnect.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectGrammar.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdown.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponse.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponse.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AndFilter.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ConnectorFilter.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/Filter.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/NotFilter.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/OrFilter.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/PresentFilter.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultDone.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultReference.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilter.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControl.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControl.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControl.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequest.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/EntryChangeControl.java
    directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java
    directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java

Modified: directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/Asn1Object.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/Asn1Object.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/Asn1Object.java (original)
+++ directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/Asn1Object.java Sat Feb  3 15:13:50 2007
@@ -44,8 +44,31 @@
 
     /** The encapsulating Object */
     protected transient Asn1Object parent;
+    
+    /** The identifier of the asqsocaited TLV */
+    private transient int tlvId;
 
-
+    /**
+     * Constructor associated with a TLV indentifier. Used when 
+     * decoded a TLV, we create an association between the decode
+     * Asn1Object and the TLV which is the encoded form.
+     * 
+     * @param tlvId The TLV Id.
+     */
+    protected Asn1Object( int tlvId )
+    {
+        this.tlvId = tlvId;
+    }
+    
+    /**
+     * Default constructor. The TLV Id is set to -1. This constructor
+     * is called when an Asn1Object is created to be encoded, not decoded.
+     */
+    protected Asn1Object()
+    {
+        this.tlvId = -1;
+    }
+    
     // ~ Methods
     // ------------------------------------------------------------------------------------
 
@@ -156,5 +179,10 @@
     public void setParent( Asn1Object parent )
     {
         this.parent = parent;
+    }
+
+    public int getTlvId()
+    {
+        return tlvId;
     }
 }

Modified: directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java (original)
+++ directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java Sat Feb  3 15:13:50 2007
@@ -61,6 +61,9 @@
 
     /** The grammar end transition flag */
     protected boolean grammarEndAllowed;
+    
+    /** The incremental id used to tag TLVs */
+    private int id = 0;
 
     // ~ Methods
     // ------------------------------------------------------------------------------------
@@ -207,5 +210,16 @@
         parentTLV = null;
         transition = 0;
         state = TLVStateEnum.TAG_STATE_START;
+    }
+
+
+    public int getNewTlvId()
+    {
+        return id++;
+    }
+
+    public int getTlvId()
+    {
+        return tlv.getId();
     }
 }

Modified: directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java (original)
+++ directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java Sat Feb  3 15:13:50 2007
@@ -107,7 +107,7 @@
 
             byte octet = stream.get();
 
-            TLV tlv = new TLV();
+            TLV tlv = new TLV( container.getNewTlvId() );
             tlv.setTag( octet );
 
             // Store the current TLV in the container.

Modified: directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java (original)
+++ directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java Sat Feb  3 15:13:50 2007
@@ -126,4 +126,16 @@
      * being an end or not.
      */
     public void grammarEndAllowed( boolean grammarEndAllowed );
+    
+    /**
+     * Get a new TLV id
+     * @return a unique value representing the current TLV id
+     */
+    public int getNewTlvId();
+
+    /**
+     * Get the current TLV id
+     * @return a unique value representing the current TLV id
+     */
+    public int getTlvId();
 }

Modified: directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java (original)
+++ directory/shared/branches/0.9.5/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java Sat Feb  3 15:13:50 2007
@@ -50,6 +50,9 @@
 
     /** The current Value being processed */
     private Value value;
+    
+    /** An identity for the TLV. It store the TLV hashCode */
+    private int id;
 
     /**
      * Reference the TLV which contains the current TLV, if any. As the
@@ -88,12 +91,13 @@
     /**
      * Creates a new TLV object.
      */
-    public TLV()
+    public TLV( int id )
     {
         tag = 0;
         length = 0;
         lengthNbBytes = 0;
         value = new Value();
+        this.id = id;
 
         expectedLength = 0;
     }
@@ -388,6 +392,12 @@
     public void incLengthBytesRead()
     {
         LengthBytesRead++;
+    }
+
+
+    public int getId()
+    {
+        return id;
     }
 }
  

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java Sat Feb  3 15:13:50 2007
@@ -56,6 +56,14 @@
     /** The control length */
     private transient int controlLength;
 
+    /**
+     * Default constructor.
+     */
+    public Control()
+    {
+        super();
+    }
+    
     // ~ Methods
     // ------------------------------------------------------------------------------------
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessage.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessage.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessage.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessage.java Sat Feb  3 15:13:50 2007
@@ -94,6 +94,7 @@
      */
     public LdapMessage()
     {
+        super();
         // We should not create this kind of object directly
     }
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponse.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponse.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponse.java Sat Feb  3 15:13:50 2007
@@ -53,7 +53,6 @@
         super();
     }
 
-
     // ~ Methods
     // ------------------------------------------------------------------------------------
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java Sat Feb  3 15:13:50 2007
@@ -119,10 +119,11 @@
     // -------------------------------------------------------------------------------
 
     /**
-     * Creates a new BindResponse object.
+     * Creates a new LdapResult object.
      */
     public LdapResult()
     {
+        super();
     }
 
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ManageDsaITControl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ManageDsaITControl.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ManageDsaITControl.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ManageDsaITControl.java Sat Feb  3 15:13:50 2007
@@ -68,7 +68,15 @@
 {
     private static final ByteBuffer EMPTY_BUFFER = ByteBuffer.allocate( 0 );
 
-
+    /**
+     * Default constructor
+     *
+     */
+    public ManageDsaITControl()
+    {
+        super();
+    }
+    
     /**
      * Returns 0 everytime.
      */

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java Sat Feb  3 15:13:50 2007
@@ -110,7 +110,7 @@
             {
                 ldapDecoder.decode( buf, ldapMessageContainer );
     
-                if ( IS_DEBUG )
+                //if ( IS_DEBUG )
                 {
                     log.debug( "Decoding the PDU : " );
     

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequest.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequest.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequest.java Sat Feb  3 15:13:50 2007
@@ -69,7 +69,6 @@
         super();
     }
 
-
     // ~ Methods
     // ------------------------------------------------------------------------------------
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java Sat Feb  3 15:13:50 2007
@@ -71,7 +71,7 @@
         SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the SearchRequest
-        Filter andFilter = new AndFilter();
+        Filter andFilter = new AndFilter( ldapMessageContainer.getTlvId() );
 
         // Set the filter
         searchRequest.addCurrentFilter( andFilter );

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java Sat Feb  3 15:13:50 2007
@@ -59,7 +59,9 @@
         SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the Attribute Value Assertion
-        Filter filter = new AttributeValueAssertionFilter( LdapConstants.APPROX_MATCH_FILTER );
+        Filter filter = new AttributeValueAssertionFilter( 
+            ldapMessageContainer.getTlvId(), 
+            LdapConstants.APPROX_MATCH_FILTER );
 
         searchRequest.addCurrentFilter( filter );
         

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java Sat Feb  3 15:13:50 2007
@@ -62,7 +62,9 @@
         SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the Attribute Value Assertion
-        Filter filter = new AttributeValueAssertionFilter( LdapConstants.EQUALITY_MATCH_FILTER );
+        Filter filter = new AttributeValueAssertionFilter( 
+            ldapMessageContainer.getTlvId(),
+            LdapConstants.EQUALITY_MATCH_FILTER );
 
         searchRequest.addCurrentFilter( filter );
         

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java Sat Feb  3 15:13:50 2007
@@ -58,7 +58,7 @@
         SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the ExtensibleMatch Filter
-        Filter extensibleMatchFilter = new ExtensibleMatchFilter();
+        Filter extensibleMatchFilter = new ExtensibleMatchFilter( ldapMessageContainer.getTlvId() );
 
         searchRequest.addCurrentFilter( extensibleMatchFilter );
         searchRequest.setTerminalFilter( extensibleMatchFilter );

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java Sat Feb  3 15:13:50 2007
@@ -62,7 +62,9 @@
         SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the Attribute Value Assertion
-        Filter filter = new AttributeValueAssertionFilter( LdapConstants.GREATER_OR_EQUAL_FILTER );
+        Filter filter = new AttributeValueAssertionFilter( 
+            ldapMessageContainer.getTlvId(), 
+            LdapConstants.GREATER_OR_EQUAL_FILTER );
 
         searchRequest.addCurrentFilter( filter );
         

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java Sat Feb  3 15:13:50 2007
@@ -62,7 +62,9 @@
         SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the Attribute Value Assertion
-        Filter filter = new AttributeValueAssertionFilter( LdapConstants.LESS_OR_EQUAL_FILTER );
+        Filter filter = new AttributeValueAssertionFilter(  
+            ldapMessageContainer.getTlvId(), 
+            LdapConstants.LESS_OR_EQUAL_FILTER );
 
         searchRequest.addCurrentFilter( filter );
         

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java Sat Feb  3 15:13:50 2007
@@ -71,7 +71,7 @@
         SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the SearchRequest
-        Filter notFilter = new NotFilter();
+        Filter notFilter = new NotFilter( ldapMessageContainer.getTlvId() );
 
         // Set the filter
         searchRequest.addCurrentFilter( notFilter );

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java Sat Feb  3 15:13:50 2007
@@ -71,7 +71,7 @@
         SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the SearchRequest
-        Filter orFilter = new OrFilter();
+        Filter orFilter = new OrFilter( ldapMessageContainer.getTlvId() );
 
         // Set the filter
         searchRequest.addCurrentFilter( orFilter );

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java Sat Feb  3 15:13:50 2007
@@ -61,7 +61,7 @@
         TLV tlv = ldapMessageContainer.getCurrentTLV();
 
         // We can allocate the Attribute Value Assertion
-        PresentFilter presentFilter = new PresentFilter();
+        PresentFilter presentFilter = new PresentFilter( ldapMessageContainer.getTlvId() );
 
         // add the filter to the request filter
         searchRequest.addCurrentFilter( presentFilter );

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java Sat Feb  3 15:13:50 2007
@@ -72,7 +72,7 @@
         }
 
         // We can allocate the SearchRequest
-        Filter substringFilter = new SubstringFilter();
+        Filter substringFilter = new SubstringFilter( ldapMessageContainer.getTlvId() );
 
         searchRequest.addCurrentFilter( substringFilter );
         searchRequest.setTerminalFilter( substringFilter );

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddResponse.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddResponse.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddResponse.java Sat Feb  3 15:13:50 2007
@@ -49,7 +49,6 @@
         super();
     }
 
-
     // ~ Methods
     // ------------------------------------------------------------------------------------
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/LdapAuthentication.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/LdapAuthentication.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/LdapAuthentication.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/LdapAuthentication.java Sat Feb  3 15:13:50 2007
@@ -32,4 +32,11 @@
  */
 public abstract class LdapAuthentication extends Asn1Object
 {
+    /**
+     * @see Asn1Object#Asn1Object
+     */
+    public LdapAuthentication()
+    {
+        super();
+    }
 }

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SaslCredentials.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SaslCredentials.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SaslCredentials.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SaslCredentials.java Sat Feb  3 15:13:50 2007
@@ -65,6 +65,13 @@
     /** The credentials length */
     private transient int credentialsLength;
 
+    /**
+     * @see Asn1Object#Asn1Object
+     */
+    public SaslCredentials()
+    {
+        super();
+    }
 
     // ~ Methods
     // ------------------------------------------------------------------------------------

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SimpleAuthentication.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SimpleAuthentication.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SimpleAuthentication.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SimpleAuthentication.java Sat Feb  3 15:13:50 2007
@@ -49,7 +49,14 @@
     /** The simple authentication password */
     private byte[] simple;
 
-
+    /**
+     * @see Asn1Object#Asn1Object
+     */
+    public SimpleAuthentication()
+    {
+        super();
+    }
+    
     // ~ Methods
     // ------------------------------------------------------------------------------------
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelResponse.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelResponse.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelResponse.java Sat Feb  3 15:13:50 2007
@@ -49,7 +49,6 @@
         super();
     }
 
-
     /**
      * Get the message type
      * 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequest.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequest.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequest.java Sat Feb  3 15:13:50 2007
@@ -68,7 +68,6 @@
         super();
     }
 
-
     // ~ Methods
     // ------------------------------------------------------------------------------------
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulAction.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulAction.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulAction.java Sat Feb  3 15:13:50 2007
@@ -38,10 +38,10 @@
     public static final int NOW = 0;
 
     /** offline Time after disconnection */
-    protected int timeOffline;
+    protected int timeOffline = UNDETERMINED;
 
     /** Delay before disconnection */
-    protected int delay;
+    protected int delay = NOW;
 
 
     /**
@@ -50,19 +50,18 @@
      */
     public GracefulAction()
     {
-        timeOffline = UNDETERMINED;
-        delay = NOW;
+        super();
     }
 
-
     /**
      * Create a GracefulAction object, with a timeOffline and a delay
      * 
      * @param timeOffline The time the server will be offline
      * @param delay The delay before the disconnection
      */
-    public GracefulAction(int timeOffline, int delay)
+    public GracefulAction( int timeOffline, int delay )
     {
+        super();
         this.timeOffline = timeOffline;
         this.delay = delay;
     }

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnect.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnect.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnect.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnect.java Sat Feb  3 15:13:50 2007
@@ -50,7 +50,7 @@
 public class GracefulDisconnect extends GracefulAction
 {
     /** List of the alternate servers to use */
-    private List replicatedContexts;
+    private List replicatedContexts = new ArrayList( 2 );
 
     /** Length of the sequence */
     private transient int gracefulDisconnectSequenceLength;
@@ -65,12 +65,9 @@
      * @param timeOffline The time the server will be offline
      * @param delay The delay before the disconnection
      */
-    public GracefulDisconnect(int timeOffline, int delay)
+    public GracefulDisconnect( int timeOffline, int delay )
     {
         super( timeOffline, delay );
-
-        // Two urls will be enough, generally
-        this.replicatedContexts = new ArrayList( 2 );
     }
 
 
@@ -80,11 +77,7 @@
     public GracefulDisconnect()
     {
         super();
-
-        // Two urls will be enough, generally
-        this.replicatedContexts = new ArrayList( 2 );
     }
-
 
     /**
      * Get the list of replicated servers

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectGrammar.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectGrammar.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectGrammar.java Sat Feb  3 15:13:50 2007
@@ -192,7 +192,8 @@
                 public void action( IAsn1Container container )
                 {
                     GracefulDisconnectContainer gracefulDisconnectContainer = ( GracefulDisconnectContainer ) container;
-                    GracefulDisconnect gracefulDisconnect = new GracefulDisconnect();
+                    GracefulDisconnect gracefulDisconnect = 
+                        new GracefulDisconnect();
                     gracefulDisconnectContainer.setGracefulDisconnect( gracefulDisconnect );
                     gracefulDisconnectContainer.grammarEndAllowed( true );
                 }

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdown.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdown.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdown.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdown.java Sat Feb  3 15:13:50 2007
@@ -47,7 +47,14 @@
     /** Length of the sequence */
     private transient int gracefulSequenceLength;
 
-
+    /**
+     * @see Asn1Object#Asn1Object
+     */
+    public GracefulShutdown()
+    {
+        super();
+    }
+    
     /**
      * Compute the GracefulShutdown length 
      * 0x30 L1 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java Sat Feb  3 15:13:50 2007
@@ -122,7 +122,6 @@
         super();
     }
 
-
     // ~ Methods
     // ------------------------------------------------------------------------------------
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponse.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponse.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponse.java Sat Feb  3 15:13:50 2007
@@ -49,7 +49,6 @@
         super();
     }
 
-
     /**
      * Get the message type
      * 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java Sat Feb  3 15:13:50 2007
@@ -75,7 +75,6 @@
         super();
     }
 
-
     // ~ Methods
     // ------------------------------------------------------------------------------------
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponse.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponse.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponse.java Sat Feb  3 15:13:50 2007
@@ -49,7 +49,6 @@
         super();
     }
 
-
     /**
      * Get the message type
      * 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AndFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AndFilter.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AndFilter.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AndFilter.java Sat Feb  3 15:13:50 2007
@@ -43,9 +43,9 @@
      * The constructor. We wont initialize the ArrayList as they may not be
      * used.
      */
-    public AndFilter()
+    public AndFilter( int tlvId )
     {
-        super();
+        super( tlvId );
     }
 
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java Sat Feb  3 15:13:50 2007
@@ -59,11 +59,11 @@
      * 
      * @param filterType The filter type
      */
-    public AttributeValueAssertionFilter( int filterType )
+    public AttributeValueAssertionFilter( int tlvId, int filterType )
     {
+        super( tlvId );
         this.filterType = filterType;
     }
-
 
     // ~ Methods
     // ------------------------------------------------------------------------------------

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ConnectorFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ConnectorFilter.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ConnectorFilter.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ConnectorFilter.java Sat Feb  3 15:13:50 2007
@@ -52,8 +52,9 @@
     /**
      * The constructor. We wont initialize the ArrayList as it may not be used.
      */
-    public ConnectorFilter()
+    public ConnectorFilter( int tlvId )
     {
+        super( tlvId );
     }
 
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java Sat Feb  3 15:13:50 2007
@@ -58,7 +58,7 @@
     private Object matchValue;
 
     /** The dnAttributes flag */
-    private boolean dnAttributes;
+    private boolean dnAttributes = false;
 
     /** The extensible match length */
     private transient int extensibleMatchLength;
@@ -69,11 +69,10 @@
      * Creates a new ExtensibleMatchFilter object. The dnAttributes flag
      * defaults to false.
      */
-    public ExtensibleMatchFilter()
+    public ExtensibleMatchFilter( int tlvId )
     {
-        dnAttributes = false;
+        super( tlvId );
     }
-
 
     // ~ Methods
     // ------------------------------------------------------------------------------------

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/Filter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/Filter.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/Filter.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/Filter.java Sat Feb  3 15:13:50 2007
@@ -33,9 +33,10 @@
 public abstract class Filter extends Asn1Object
 {
     /**
-     * The constructor.
+     * @see Asn1Object#Asn1Object
      */
-    public Filter()
+    public Filter( int tlvId )
     {
+        super( tlvId );
     }
 }

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/NotFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/NotFilter.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/NotFilter.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/NotFilter.java Sat Feb  3 15:13:50 2007
@@ -42,8 +42,9 @@
     /**
      * The constructor.
      */
-    public NotFilter()
+    public NotFilter( int tlvId )
     {
+        super( tlvId );
     }
 
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/OrFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/OrFilter.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/OrFilter.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/OrFilter.java Sat Feb  3 15:13:50 2007
@@ -43,8 +43,9 @@
      * The constructor. We wont initialize the ArrayList as they may not be
      * used.
      */
-    public OrFilter()
+    public OrFilter( int tlvId )
     {
+        super( tlvId );
     }
 
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/PresentFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/PresentFilter.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/PresentFilter.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/PresentFilter.java Sat Feb  3 15:13:50 2007
@@ -52,8 +52,9 @@
     /**
      * The constructor.
      */
-    public PresentFilter()
+    public PresentFilter( int tlvId )
     {
+        super( tlvId );
     }
 
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java Sat Feb  3 15:13:50 2007
@@ -87,7 +87,7 @@
     private Filter filter;
     
     /** The list of attributes to get */
-    private Attributes attributes;
+    private Attributes attributes = new LockableAttributesImpl( true );
 
     /** The current filter. This is used while decoding a PDU */
     private transient Filter currentFilter;
@@ -111,12 +111,8 @@
     public SearchRequest()
     {
         super();
-
-        currentFilter = null;
-        attributes = new LockableAttributesImpl( true );
     }
 
-
     // ~ Methods
     // ------------------------------------------------------------------------------------
 
@@ -389,6 +385,8 @@
      * is considered as terminated either if :
      *  - it's a final element (ie an element which cannot contains a Filter)
      *  - its current length equals its expected length.
+     *  
+     *  The main problem is that we must 
      * 
      * @param container The container being decoded
      */
@@ -403,27 +401,38 @@
         // The parent has been completed, so fold it
         while ( ( parent != null ) && ( parent.getExpectedLength() == 0 ) )
         {
-            Asn1Object filterParent = filter.getParent();
-            
-            // We have a special case with PresentFilter, which has not been 
-            // pushed on the stack, so we need to get its parent's parent
-            if ( filter instanceof PresentFilter )
+            if ( parent.getId() != filter.getParent().getTlvId() )
             {
-                filterParent = filterParent.getParent();
-            }
-
-            if ( filterParent instanceof Filter )
-            {
-                // The parent is a filter ; it will become the new currentFilter
-                // and we will loop again. 
-                currentFilter = (Filter)filterParent;
-                filter = currentFilter;
                 parent = parent.getParent();
             }
             else
             {
-                // We can stop the recursion, we have reached the searchResult Object
-                break;
+                Asn1Object filterParent = filter.getParent();
+                
+                // We have a special case with PresentFilter, which has not been 
+                // pushed on the stack, so we need to get its parent's parent
+                if ( filter instanceof PresentFilter )
+                {
+                    filterParent = filterParent.getParent();
+                }
+                else if ( filterParent instanceof Filter )
+                {
+                    filterParent = filterParent.getParent();
+                }
+    
+                if ( filterParent instanceof Filter )
+                {
+                    // The parent is a filter ; it will become the new currentFilter
+                    // and we will loop again. 
+                    currentFilter = (Filter)filterParent;
+                    filter = currentFilter;
+                    parent = parent.getParent();
+                }
+                else
+                {
+                    // We can stop the recursion, we have reached the searchResult Object
+                    break;
+                }
             }
         }
     }

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultDone.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultDone.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultDone.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultDone.java Sat Feb  3 15:13:50 2007
@@ -51,7 +51,6 @@
         super();
     }
 
-
     /**
      * Get the message type
      * 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java Sat Feb  3 15:13:50 2007
@@ -72,7 +72,7 @@
     private LdapDN objectName;
 
     /** The attributes list. It contains javax.naming.directory.Attribute */
-    private Attributes partialAttributeList;
+    private Attributes partialAttributeList = new LockableAttributesImpl( true );
 
     /** The current attribute being decoded */
     private transient Attribute currentAttributeValue;
@@ -99,9 +99,7 @@
     public SearchResultEntry()
     {
         super();
-        partialAttributeList = new LockableAttributesImpl( true );
     }
-
 
     // ~ Methods
     // ------------------------------------------------------------------------------------

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultReference.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultReference.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultReference.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultReference.java Sat Feb  3 15:13:50 2007
@@ -46,7 +46,7 @@
     // ----------------------------------------------------------------------------
 
     /** The set of LdapURLs */
-    private ArrayList searchResultReferences;
+    private ArrayList searchResultReferences = new ArrayList();
 
     /** The search result reference length */
     private transient int searchResultReferenceLength;
@@ -61,7 +61,6 @@
     public SearchResultReference()
     {
         super();
-        searchResultReferences = new ArrayList();
     }
 
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilter.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilter.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilter.java Sat Feb  3 15:13:50 2007
@@ -70,7 +70,7 @@
     private String initialSubstrings;
 
     /** The any filter. It's a list of LdapString */
-    private ArrayList anySubstrings;
+    private ArrayList anySubstrings = new ArrayList( 1 );
 
     /** The final filter */
     private String finalSubstrings;
@@ -89,11 +89,10 @@
      * The constructor. We will create the 'any' subsring arraylist with only
      * one element.
      */
-    public SubstringFilter()
+    public SubstringFilter( int tlvId )
     {
-        anySubstrings = new ArrayList( 1 );
+        super( tlvId );
     }
-
 
     /**
      * Get the internal substrings

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControl.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControl.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControl.java Sat Feb  3 15:13:50 2007
@@ -95,6 +95,13 @@
     /** The entry change global length */
     private transient int eccSeqLength;
 
+    /**
+     * @see Asn1Object#Asn1Object
+     */
+    public EntryChangeControl()
+    {
+        super();
+    }
 
     /**
      * Compute the EntryChangeControl length 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControl.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControl.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControl.java Sat Feb  3 15:13:50 2007
@@ -74,7 +74,15 @@
     /** A temporary storage for a psearch length */
     private transient int psearchSeqLength;
 
-
+    /**
+     * Default constructor
+     *
+     */
+    public PSearchControl()
+    {
+        super();
+    }
+    
     public void setChangesOnly( boolean changesOnly )
     {
         this.changesOnly = changesOnly;

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControl.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControl.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControl.java Sat Feb  3 15:13:50 2007
@@ -37,6 +37,14 @@
 {
     private boolean visibility = false;
 
+    /**
+     * Default constructor
+     *
+     */
+    public SubEntryControl()
+    {
+        super();
+    }
 
     /**
      * Check if the subEntry is visible

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequest.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequest.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequest.java Sat Feb  3 15:13:50 2007
@@ -54,7 +54,6 @@
         super();
     }
 
-
     // ~ Methods
     // ------------------------------------------------------------------------------------
 

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/EntryChangeControl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/EntryChangeControl.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/EntryChangeControl.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/EntryChangeControl.java Sat Feb  3 15:13:50 2007
@@ -139,7 +139,8 @@
         if ( getValue() == null )
         {
             // should call this codec or something
-            org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControl ecc = new org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControl();
+            org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControl ecc = 
+                new org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControl();
             ecc.setChangeNumber( changeNumber );
             ecc.setChangeType( changeType );
             ecc.setPreviousDn( previousDn );

Modified: directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java Sat Feb  3 15:13:50 2007
@@ -128,6 +128,7 @@
         codec.setTimeOffline( this.timeOffline );
         codec.setDelay( this.delay );
         Iterator contexts = this.replicatedContexts.getLdapUrls().iterator();
+        
         while ( contexts.hasNext() )
         {
             String urlstr = ( String ) contexts.next();

Modified: directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?view=diff&rev=503333&r1=503332&r2=503333
==============================================================================
--- directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original)
+++ directory/shared/branches/0.9.5/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Sat Feb  3 15:13:50 2007
@@ -4435,4 +4435,74 @@
         Attributes attributes = sr.getAttributes();
         assertEquals( 0, attributes.size() );
     }    
+    
+    /**
+     * Test the decoding of a SearchRequest with a complex filter :
+     * (&(objectClass=person)(|(cn=Tori*)(sn=Jagger)))
+     */
+    public void testDecodeSearchRequestComplexFilter()
+    {
+        Asn1Decoder ldapDecoder = new LdapDecoder();
+    
+        ByteBuffer stream = ByteBuffer.allocate( 0x77 );
+        stream.put( new byte[]
+            {
+               0x30, 0x75,                  // LdapMessage
+                 0x02, 0x01, 0x06,          // message Id = 6
+                 0x63, 0x53,                // SearchRequest
+                   0x04, 0x09,              // BasDN 'ou=system'
+                     0x6F, 0x75, 0x3D, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6D, 
+                   0x0A, 0x01, 0x02,        // scope = 2
+                   0x0A, 0x01, 0x03,        // derefAlias = 3
+                   0x02, 0x01, 0x00,        // sizeLimit = none
+                   0x02, 0x01, 0x00,        // timeLimit = none
+                   0x01, 0x01, 0x00,        // types only = false
+                   (byte)0xA0, 0x35,        // AND
+                     (byte)0xA3, 0x15,      // equals
+                       0x04, 0x0B,          // 'objectclass'
+                         0x6F, 0x62, 0x6A, 0x65, 0x63, 0x74, 0x43, 0x6C, 
+                         0x61, 0x73, 0x73, 
+                       0x04, 0x06,          // 'person'
+                         0x70, 0x65, 0x72, 0x73, 0x6F, 0x6E, 
+                     (byte)0xA1, 0x1C,      // OR
+                       (byte)0xA4, 0x0C,    // substrings : 'cn=Tori*'
+                         0x04, 0x02,        // 'cn'
+                           0x63, 0x6E, 
+                         0x30, 0x06,        // initial = 'Tori'
+                           (byte)0x80, 0x04, 
+                               0x54, 0x6F, 0x72, 0x69, 
+                       (byte)0xA3, 0x0C,    // equals
+                         0x04, 0x02,        // 'sn'
+                           0x73, 0x6E,    
+                         0x04, 0x06,        // 'Jagger'
+                           0x4A, 0x61, 0x67, 0x67, 0x65, 0x72, 
+                   0x30, 0x00,              // Control
+                   (byte)0xA0, 0x1B, 
+                     0x30, 0x19, 
+                       0x04, 0x17, 
+                         '2', '.', '1', '6', '.', '8', '4', '0', '.',
+                         '1', '.', '1', '1', '3', '7', '3', '0', '.',
+                         '3', '.', '4', '.', '2'
+            } );
+        
+        stream.flip();
+    
+        // Allocate a BindRequest Container
+        IAsn1Container ldapMessageContainer = new LdapMessageContainer();
+    
+        try
+        {
+            ldapDecoder.decode( stream, ldapMessageContainer );
+        }
+        catch ( DecoderException de )
+        {
+            de.printStackTrace();
+            fail( de.getMessage() );
+        }
+        catch ( NamingException ne )
+        {
+            ne.printStackTrace();
+            fail( ne.getMessage() );
+        }
+    }
 }



Mime
View raw message