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 2011/01/26 16:57:18 UTC
svn commit: r1063767 - in /directory/shared/trunk/ldap/src:
main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearch.java
test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
Author: elecharny
Date: Wed Jan 26 15:57:18 2011
New Revision: 1063767
URL: http://svn.apache.org/viewvc?rev=1063767&view=rev
Log:
Fixed the PSearch control codec
Modified:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearch.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearch.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearch.java?rev=1063767&r1=1063766&r2=1063767&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearch.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearch.java Wed Jan 26 15:57:18 2011
@@ -80,7 +80,7 @@ public class PersistentSearch extends Ba
*/
public PersistentSearch()
{
- super( "" );
+ super( OID );
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java?rev=1063767&r1=1063766&r2=1063767&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java Wed Jan 26 15:57:18 2011
@@ -28,8 +28,8 @@ import java.nio.ByteBuffer;
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
-import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.DecoderException;
+import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearch;
import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchContainer;
import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchDecoder;
@@ -111,8 +111,7 @@ public class PSearchControlTest
fail( de.getMessage() );
}
- PersistentSearchDecorator decorator = new PersistentSearchDecorator();
- PersistentSearch ctrl = ( PersistentSearch ) decorator.getDecorated();
+ PersistentSearch ctrl = ( PersistentSearch ) container.getPSearchDecorator().getDecorated();
int changeTypes = ctrl.getChangeTypes();
assertEquals( PersistentSearch.CHANGE_TYPE_ADD, changeTypes & PersistentSearch.CHANGE_TYPE_ADD );
assertEquals( PersistentSearch.CHANGE_TYPE_MODDN, changeTypes & PersistentSearch.CHANGE_TYPE_MODDN );