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/09/27 15:58:50 UTC
svn commit: r291942 - in
/directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo:
CompareRequest.java LdapResult.java ModifyDNRequest.java
SaslCredentials.java SearchResultReference.java
Author: elecharny
Date: Tue Sep 27 06:58:43 2005
New Revision: 291942
URL: http://svn.apache.org/viewcvs?rev=291942&view=rev
Log:
Committed to be able to work at home
Modified:
directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/CompareRequest.java
directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/LdapResult.java
directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/ModifyDNRequest.java
directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/SaslCredentials.java
directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/SearchResultReference.java
Modified: directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/CompareRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/CompareRequest.java?rev=291942&r1=291941&r2=291942&view=diff
==============================================================================
--- directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/CompareRequest.java (original)
+++ directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/CompareRequest.java Tue Sep 27 06:58:43 2005
@@ -223,7 +223,7 @@
}
// The attributeDesc
- Value.encode( buffer, attributeDesc );
+ Value.encode( buffer, attributeDesc.toString() );
// The assertionValue
Value.encode( buffer, assertionValue );
Modified: directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/LdapResult.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/LdapResult.java?rev=291942&r1=291941&r2=291942&view=diff
==============================================================================
--- directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/LdapResult.java (original)
+++ directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/LdapResult.java Tue Sep 27 06:58:43 2005
@@ -285,7 +285,7 @@
Value.encode( buffer, matchedDN.toString() );
// The error message
- Value.encode( buffer, errorMessage);
+ Value.encode( buffer, errorMessage.toString() );
// The referrals, if any
if ( ( referrals != null ) && ( referrals.size() != 0 ) )
@@ -303,7 +303,7 @@
LdapURL referral = ( LdapURL ) referralIterator.next();
// Ecode the current referral
- Value.encode( buffer, referral);
+ Value.encode( buffer, referral.toString());
}
}
Modified: directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/ModifyDNRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/ModifyDNRequest.java?rev=291942&r1=291941&r2=291942&view=diff
==============================================================================
--- directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/ModifyDNRequest.java (original)
+++ directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/ModifyDNRequest.java Tue Sep 27 06:58:43 2005
@@ -225,7 +225,7 @@
Value.encode( buffer, entry.getNameNormalized() );
// The newRDN
- Value.encode( buffer, newRDN );
+ Value.encode( buffer, newRDN.toString() );
// The flag deleteOldRdn
Value.encode( buffer, deleteOldRDN );
Modified: directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/SaslCredentials.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/SaslCredentials.java?rev=291942&r1=291941&r2=291942&view=diff
==============================================================================
--- directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/SaslCredentials.java (original)
+++ directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/SaslCredentials.java Tue Sep 27 06:58:43 2005
@@ -16,6 +16,7 @@
*/
package org.apache.asn1new.ldap.pojo;
+import java.io.UnsupportedEncodingException;
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
@@ -150,7 +151,7 @@
// The saslAuthentication Tag
buffer.put( (byte)LdapConstants.BIND_REQUEST_SASL_TAG );
buffer.put( Length.getBytes( mechanism.getLength() ) ) ;
- buffer.put( mechanism.getData() ) ;
+ buffer.put( mechanism.getBytes() ) ;
if ( credentials != null )
{
@@ -161,6 +162,11 @@
{
log.error( "The PDU buffer size is too small !" );
throw new EncoderException("The PDU buffer size is too small !");
+ }
+ catch ( UnsupportedEncodingException uee )
+ {
+ log.error( "The mechanism is not a valid UTF-8 String !" );
+ throw new EncoderException( "The mechanism is not a valid UTF-8 String !" );
}
return buffer;
Modified: directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/SearchResultReference.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/SearchResultReference.java?rev=291942&r1=291941&r2=291942&view=diff
==============================================================================
--- directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/SearchResultReference.java (original)
+++ directory/shared/ldap/branches/shared-ldap-NameComponent/apache2-provider/src/java/main/org/apache/asn1new/ldap/pojo/SearchResultReference.java Tue Sep 27 06:58:43 2005
@@ -154,7 +154,7 @@
LdapURL reference = ((LdapURL)referencesIterator.next());
// Encode the reference
- Value.encode( buffer, reference );
+ Value.encode( buffer, reference.toString() );
}
}
catch ( BufferOverflowException boe )