directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1393069 - /directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
Date Tue, 02 Oct 2012 18:07:58 GMT
Author: elecharny
Date: Tue Oct  2 18:07:57 2012
New Revision: 1393069

URL: http://svn.apache.org/viewvc?rev=1393069&view=rev
Log:
The unstackFilters method was not correctly unstacking the filters : we were setting the currentFilter
*before* updating the localFilter, thus jumpng up two level in the stack.
Fix for DIRSERVER-1744

Modified:
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java?rev=1393069&r1=1393068&r2=1393069&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
(original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
Tue Oct  2 18:07:57 2012
@@ -100,7 +100,7 @@ public class SearchRequestDecorator exte
 
     /** The SearchRequest TLV id */
     private int tlvId;
-    
+
     /** The bytes containing the Dn */
     private byte[] dnBytes;
 
@@ -337,8 +337,8 @@ public class SearchRequestDecorator exte
                 {
                     // The parent is a filter ; it will become the new currentFilter
                     // and we will loop again.
-                    currentFilter = filterParent;
                     localFilter = currentFilter;
+                    currentFilter = filterParent;
                     localParent = localParent.getParent();
                 }
                 else



Mime
View raw message