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 2010/05/27 10:22:26 UTC
svn commit: r948714 - in
/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap:
codec/bind/ codec/extended/operations/gracefulShutdown/
codec/search/controls/entryChange/ codec/search/controls/pagedSearch/
entry/ exception/
Author: elecharny
Date: Thu May 27 08:22:26 2010
New Revision: 948714
URL: http://svn.apache.org/viewvc?rev=948714&view=rev
Log:
Removed useless imports
Modified:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SaslCredentials.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdown.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/BinaryValue.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/AbstractLdapReferralException.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapPartialResultException.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapTimeLimitExceededException.java
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SaslCredentials.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SaslCredentials.java?rev=948714&r1=948713&r2=948714&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SaslCredentials.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SaslCredentials.java Thu May 27 08:22:26 2010
@@ -23,7 +23,6 @@ package org.apache.directory.shared.ldap
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
-import org.apache.directory.shared.asn1.Asn1Object;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.asn1.codec.EncoderException;
@@ -55,7 +54,7 @@ public class SaslCredentials extends Lda
* Any mechanism defined in RFC 2222 : KERBEROS_V4, GSSAPI, SKEY, EXTERNAL
*/
private String mechanism;
-
+
/** The mechanism bytes */
private byte[] mechanismBytes;
@@ -70,13 +69,16 @@ public class SaslCredentials extends Lda
/**
- * @see Asn1Object#Asn1Object
+ *
+ * Creates a new instance of SaslCredentials.
+ *
*/
public SaslCredentials()
{
super();
}
+
// ~ Methods
// ------------------------------------------------------------------------------------
@@ -92,7 +94,7 @@ public class SaslCredentials extends Lda
return null;
}
- final byte[] copy = new byte[ credentials.length ];
+ final byte[] copy = new byte[credentials.length];
System.arraycopy( credentials, 0, copy, 0, credentials.length );
return copy;
}
@@ -107,9 +109,11 @@ public class SaslCredentials extends Lda
{
if ( credentials != null )
{
- this.credentials = new byte[ credentials.length ];
+ this.credentials = new byte[credentials.length];
System.arraycopy( credentials, 0, this.credentials, 0, credentials.length );
- } else {
+ }
+ else
+ {
this.credentials = null;
}
}
@@ -214,7 +218,7 @@ public class SaslCredentials extends Lda
catch ( BufferOverflowException boe )
{
log.error( I18n.err( I18n.ERR_04005 ) );
- throw new EncoderException( I18n.err( I18n.ERR_04005) );
+ throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
return buffer;
@@ -235,9 +239,7 @@ public class SaslCredentials extends Lda
if ( credentials != null )
{
- sb.append( "\n Credentials :'" ).
- append( StringTools.dumpBytes( credentials ) ).
- append( '\'' );
+ sb.append( "\n Credentials :'" ).append( StringTools.dumpBytes( credentials ) ).append( '\'' );
}
return sb.toString();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdown.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdown.java?rev=948714&r1=948713&r2=948714&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdown.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdown.java Thu May 27 08:22:26 2010
@@ -22,7 +22,6 @@ package org.apache.directory.shared.ldap
import java.nio.ByteBuffer;
-import org.apache.directory.shared.asn1.Asn1Object;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
import org.apache.directory.shared.asn1.ber.tlv.Value;
@@ -50,14 +49,18 @@ public class GracefulShutdown extends Gr
/** Length of the sequence */
private int gracefulSequenceLength;
+
/**
- * @see Asn1Object#Asn1Object
+ *
+ * Creates a new instance of GracefulShutdown.
+ *
*/
public GracefulShutdown()
{
super();
}
+
/**
* Compute the GracefulShutdown length
* 0x30 L1
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java?rev=948714&r1=948713&r2=948714&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java Thu May 27 08:22:26 2010
@@ -22,7 +22,6 @@ package org.apache.directory.shared.ldap
import java.nio.ByteBuffer;
-import org.apache.directory.shared.asn1.Asn1Object;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
import org.apache.directory.shared.asn1.ber.tlv.Value;
@@ -95,7 +94,7 @@ public class EntryChangeControl extends
/** The previous DN */
private DN previousDn = null;
-
+
/** A temporary storage for the previous DN */
private byte[] previousDnBytes = null;
@@ -104,16 +103,18 @@ public class EntryChangeControl extends
/**
- * @see Asn1Object#Asn1Object
+ *
+ * Creates a new instance of EntryChangeControl.
+ *
*/
public EntryChangeControl()
{
super( CONTROL_OID );
-
+
decoder = new EntryChangeControlDecoder();
}
-
+
/**
* Compute the EntryChangeControl length
*
@@ -165,7 +166,7 @@ public class EntryChangeControl extends
// Encode the Control envelop
super.encode( buffer );
-
+
// Encode the OCTET_STRING tag
buffer.put( UniversalTag.OCTET_STRING_TAG );
buffer.put( TLV.getBytes( valueLength ) );
@@ -181,16 +182,16 @@ public class EntryChangeControl extends
{
Value.encode( buffer, previousDnBytes );
}
-
+
if ( changeNumber != UNDEFINED_CHANGE_NUMBER )
{
Value.encode( buffer, changeNumber );
}
-
+
return buffer;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -199,27 +200,27 @@ public class EntryChangeControl extends
if ( value == null )
{
try
- {
+ {
computeLength();
ByteBuffer buffer = ByteBuffer.allocate( valueLength );
-
+
buffer.put( UniversalTag.SEQUENCE_TAG );
buffer.put( TLV.getBytes( eccSeqLength ) );
-
+
buffer.put( UniversalTag.ENUMERATED_TAG );
buffer.put( ( byte ) 1 );
buffer.put( Value.getBytes( changeType.getValue() ) );
-
+
if ( previousDn != null )
{
Value.encode( buffer, previousDnBytes );
}
-
+
if ( changeNumber != UNDEFINED_CHANGE_NUMBER )
{
Value.encode( buffer, changeNumber );
}
-
+
value = buffer.array();
}
catch ( Exception e )
@@ -227,7 +228,7 @@ public class EntryChangeControl extends
return null;
}
}
-
+
return value;
}
@@ -288,7 +289,7 @@ public class EntryChangeControl extends
sb.append( " critical : " ).append( isCritical() ).append( '\n' );
sb.append( " changeType : '" ).append( changeType ).append( "'\n" );
sb.append( " previousDN : '" ).append( previousDn ).append( "'\n" );
-
+
if ( changeNumber == UNDEFINED_CHANGE_NUMBER )
{
sb.append( " changeNumber : '" ).append( "UNDEFINED" ).append( "'\n" );
@@ -297,7 +298,7 @@ public class EntryChangeControl extends
{
sb.append( " changeNumber : '" ).append( changeNumber ).append( "'\n" );
}
-
+
return sb.toString();
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java?rev=948714&r1=948713&r2=948714&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java Thu May 27 08:22:26 2010
@@ -22,7 +22,6 @@ package org.apache.directory.shared.ldap
import java.nio.ByteBuffer;
-import org.apache.directory.shared.asn1.Asn1Object;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
import org.apache.directory.shared.asn1.ber.tlv.Value;
@@ -71,25 +70,28 @@ public class PagedResultsControl extends
/** The number of entries to return, or returned */
private int size;
-
+
/** The exchanged cookie */
private byte[] cookie;
/** The entry change global length */
private int pscSeqLength;
+
/**
- * @see Asn1Object#Asn1Object
+ *
+ * Creates a new instance of PagedResultsControl.
+ *
*/
public PagedResultsControl()
{
super( CONTROL_OID );
-
+
cookie = StringTools.EMPTY_BYTES;
decoder = new PagedResultsControlDecoder();
}
-
+
/**
* Compute the PagedSearchControl length, which is the sum
* of the control length and the value length.
@@ -108,7 +110,7 @@ public class PagedResultsControl extends
int sizeLength = 1 + 1 + Value.getNbBytes( size );
int cookieLength = 0;
-
+
if ( cookie != null )
{
cookieLength = 1 + TLV.getNbBytes( cookie.length ) + cookie.length;
@@ -142,22 +144,22 @@ public class PagedResultsControl extends
// Encode the Control envelop
super.encode( buffer );
-
+
// Encode the OCTET_STRING tag
buffer.put( UniversalTag.OCTET_STRING_TAG );
buffer.put( TLV.getBytes( valueLength ) );
-
+
// Now encode the PagedSearch specific part
buffer.put( UniversalTag.SEQUENCE_TAG );
buffer.put( TLV.getBytes( pscSeqLength ) );
Value.encode( buffer, size );
Value.encode( buffer, cookie );
-
+
return buffer;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -166,17 +168,17 @@ public class PagedResultsControl extends
if ( value == null )
{
try
- {
+ {
computeLength();
ByteBuffer buffer = ByteBuffer.allocate( valueLength );
-
+
// Now encode the PagedSearch specific part
buffer.put( UniversalTag.SEQUENCE_TAG );
buffer.put( TLV.getBytes( pscSeqLength ) );
Value.encode( buffer, size );
Value.encode( buffer, cookie );
-
+
value = buffer.array();
}
catch ( Exception e )
@@ -184,7 +186,7 @@ public class PagedResultsControl extends
return null;
}
}
-
+
return value;
}
@@ -228,38 +230,39 @@ public class PagedResultsControl extends
this.cookie = cookie;
}
-
+
/**
* @return The integer value for the current cookie
*/
public int getCookieValue()
{
int value = 0;
-
+
switch ( cookie.length )
{
- case 1 :
- value = cookie[0]&0x00FF;
+ case 1:
+ value = cookie[0] & 0x00FF;
break;
-
- case 2 :
- value = ((cookie[0]&0x00FF)<<8) + (cookie[1]&0x00FF);
+
+ case 2:
+ value = ( ( cookie[0] & 0x00FF ) << 8 ) + ( cookie[1] & 0x00FF );
break;
-
- case 3 :
- value = ((cookie[0]&0x00FF)<<16) + ((cookie[1]&0x00FF)<<8) + (cookie[2]&0x00FF);
+
+ case 3:
+ value = ( ( cookie[0] & 0x00FF ) << 16 ) + ( ( cookie[1] & 0x00FF ) << 8 ) + ( cookie[2] & 0x00FF );
break;
-
- case 4 :
- value = ((cookie[0]&0x00FF)<<24) + ((cookie[1]&0x00FF)<<16) + ((cookie[2]&0x00FF)<<8) + (cookie[3]&0x00FF);
+
+ case 4:
+ value = ( ( cookie[0] & 0x00FF ) << 24 ) + ( ( cookie[1] & 0x00FF ) << 16 )
+ + ( ( cookie[2] & 0x00FF ) << 8 ) + ( cookie[3] & 0x00FF );
break;
-
+
}
-
+
return value;
}
-
-
+
+
/**
* Return a String representing this PagedSearchControl.
*/
@@ -272,7 +275,7 @@ public class PagedResultsControl extends
sb.append( " critical : " ).append( isCritical() ).append( '\n' );
sb.append( " size : '" ).append( size ).append( "'\n" );
sb.append( " cookie : '" ).append( StringTools.dumpBytes( cookie ) ).append( "'\n" );
-
+
return sb.toString();
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/BinaryValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/BinaryValue.java?rev=948714&r1=948713&r2=948714&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/BinaryValue.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/BinaryValue.java Thu May 27 08:22:26 2010
@@ -26,9 +26,8 @@ import java.io.ObjectOutput;
import java.util.Arrays;
import java.util.Comparator;
-import org.apache.directory.shared.ldap.exception.LdapException;
-
import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.LdapComparator;
import org.apache.directory.shared.ldap.schema.Normalizer;
@@ -52,13 +51,14 @@ public class BinaryValue extends Abstrac
{
/** Used for serialization */
public static final long serialVersionUID = 2L;
-
+
/** logger for reporting errors that might not be handled properly upstream */
private static final Logger LOG = LoggerFactory.getLogger( BinaryValue.class );
-
+
/** The computed hashcode. We don't want to compute it each time the hashcode() method is called */
private volatile int h;
-
+
+
/**
* Creates a BinaryValue without an initial wrapped value.
*/
@@ -69,8 +69,8 @@ public class BinaryValue extends Abstrac
valid = null;
normalizedValue = null;
}
-
-
+
+
/**
* Creates a BinaryValue without an initial wrapped value.
*
@@ -108,20 +108,20 @@ public class BinaryValue extends Abstrac
{
if ( value != null )
{
- this.wrappedValue = new byte[ value.length ];
+ this.wrappedValue = new byte[value.length];
System.arraycopy( value, 0, this.wrappedValue, 0, value.length );
}
else
{
this.wrappedValue = null;
}
-
+
normalized = false;
valid = null;
normalizedValue = null;
}
-
-
+
+
/**
* Creates a BinaryValue with an initial wrapped binary value.
*
@@ -132,8 +132,8 @@ public class BinaryValue extends Abstrac
{
this( attributeType );
SyntaxChecker syntaxChecker = attributeType.getSyntax().getSyntaxChecker();
-
- if ( syntaxChecker != null )
+
+ if ( syntaxChecker != null )
{
if ( syntaxChecker.isValidSyntax( value ) )
{
@@ -166,7 +166,7 @@ public class BinaryValue extends Abstrac
}
if ( !normalized )
- {
+ {
try
{
normalize();
@@ -181,7 +181,7 @@ public class BinaryValue extends Abstrac
if ( normalizedValue != null )
{
- byte[] copy = new byte[ normalizedValue.length ];
+ byte[] copy = new byte[normalizedValue.length];
System.arraycopy( normalizedValue, 0, copy, 0, normalizedValue.length );
return copy;
}
@@ -190,8 +190,8 @@ public class BinaryValue extends Abstrac
return StringTools.EMPTY_BYTES;
}
}
-
-
+
+
/**
* Gets the normalized (canonical) representation for the wrapped string.
* If the wrapped String is null, null is returned, otherwise the normalized
@@ -233,7 +233,7 @@ public class BinaryValue extends Abstrac
}
}
-
+
/**
* Normalize the value. For a client String value, applies the given normalizer.
*
@@ -268,7 +268,7 @@ public class BinaryValue extends Abstrac
}
}
-
+
/**
* {@inheritDoc}
*/
@@ -293,7 +293,7 @@ public class BinaryValue extends Abstrac
}
}
-
+
/**
*
* @see ServerValue#compareTo(Value)
@@ -315,14 +315,14 @@ public class BinaryValue extends Abstrac
}
else
{
- if ( ( value == null ) || value.isNull() )
+ if ( ( value == null ) || value.isNull() )
{
return 1;
}
}
BinaryValue binaryValue = ( BinaryValue ) value;
-
+
if ( attributeType != null )
{
try
@@ -371,7 +371,7 @@ public class BinaryValue extends Abstrac
{
return 0;
}
-
+
byte[] normalizedValue = getNormalizedValueReference();
h = Arrays.hashCode( normalizedValue );
}
@@ -394,19 +394,19 @@ public class BinaryValue extends Abstrac
{
return true;
}
-
- if ( ! ( obj instanceof BinaryValue ) )
+
+ if ( !( obj instanceof BinaryValue ) )
{
return false;
}
BinaryValue other = ( BinaryValue ) obj;
-
+
if ( isNull() )
{
return other.isNull();
}
-
+
// If we have an attributeType, it must be equal
// We should also use the comparator if we have an AT
if ( attributeType != null )
@@ -440,7 +440,7 @@ public class BinaryValue extends Abstrac
// We have an AttributeType, we eed to use the comparator
try
{
- Comparator<byte[]> comparator = (Comparator<byte[]>)getLdapComparator();
+ Comparator<byte[]> comparator = ( Comparator<byte[]> ) getLdapComparator();
// Compare normalized values
if ( comparator == null )
@@ -474,20 +474,20 @@ public class BinaryValue extends Abstrac
*/
public BinaryValue clone()
{
- BinaryValue clone = (BinaryValue)super.clone();
-
+ BinaryValue clone = ( BinaryValue ) super.clone();
+
if ( normalizedValue != null )
{
- clone.normalizedValue = new byte[ normalizedValue.length ];
+ clone.normalizedValue = new byte[normalizedValue.length];
System.arraycopy( normalizedValue, 0, clone.normalizedValue, 0, normalizedValue.length );
}
-
+
if ( wrappedValue != null )
{
- clone.wrappedValue = new byte[ wrappedValue.length ];
+ clone.wrappedValue = new byte[wrappedValue.length];
System.arraycopy( wrappedValue, 0, clone.wrappedValue, 0, wrappedValue.length );
}
-
+
return clone;
}
@@ -501,14 +501,14 @@ public class BinaryValue extends Abstrac
{
return null;
}
-
- final byte[] copy = new byte[ wrappedValue.length ];
+
+ final byte[] copy = new byte[wrappedValue.length];
System.arraycopy( wrappedValue, 0, copy, 0, wrappedValue.length );
-
+
return copy;
}
-
-
+
+
/**
* Tells if the current value is Binary or String
*
@@ -518,8 +518,8 @@ public class BinaryValue extends Abstrac
{
return true;
}
-
-
+
+
/**
* @return The length of the interned value
*/
@@ -539,8 +539,8 @@ public class BinaryValue extends Abstrac
{
return get();
}
-
-
+
+
/**
* Get the wrapped value as a String.
*
@@ -550,8 +550,8 @@ public class BinaryValue extends Abstrac
{
return StringTools.utf8ToString( wrappedValue );
}
-
-
+
+
/**
* @see Externalizable#readExternal(ObjectInput)
*/
@@ -559,39 +559,39 @@ public class BinaryValue extends Abstrac
{
// Read the wrapped value, if it's not null
int wrappedLength = in.readInt();
-
+
if ( wrappedLength >= 0 )
{
wrappedValue = new byte[wrappedLength];
-
+
if ( wrappedLength > 0 )
{
in.read( wrappedValue );
}
}
-
+
// Read the isNormalized flag
normalized = in.readBoolean();
-
+
if ( normalized )
{
int normalizedLength = in.readInt();
-
+
if ( normalizedLength >= 0 )
{
normalizedValue = new byte[normalizedLength];
-
+
if ( normalizedLength > 0 )
{
in.read( normalizedValue );
}
}
}
-
+
h = 0;
}
-
+
/**
* @see Externalizable#writeExternal(ObjectOutput)
*/
@@ -601,7 +601,7 @@ public class BinaryValue extends Abstrac
if ( wrappedValue != null )
{
out.writeInt( wrappedValue.length );
-
+
if ( wrappedValue.length > 0 )
{
out.write( wrappedValue, 0, wrappedValue.length );
@@ -611,17 +611,17 @@ public class BinaryValue extends Abstrac
{
out.writeInt( -1 );
}
-
+
// Write the isNormalized flag
if ( normalized )
{
out.writeBoolean( true );
-
+
// Write the normalized value, if not null
if ( normalizedValue != null )
{
out.writeInt( normalizedValue.length );
-
+
if ( normalizedValue.length > 0 )
{
out.write( normalizedValue, 0, normalizedValue.length );
@@ -637,8 +637,8 @@ public class BinaryValue extends Abstrac
out.writeBoolean( false );
}
}
-
-
+
+
/**
* We will write the value and the normalized value, only
* if the normalized value is different.
@@ -790,8 +790,8 @@ public class BinaryValue extends Abstrac
}
}
}
-
-
+
+
/**
* Dumps binary in hex with label.
*
@@ -807,9 +807,9 @@ public class BinaryValue extends Abstrac
{
// Just dump the first 16 bytes...
byte[] copy = new byte[16];
-
+
System.arraycopy( wrappedValue, 0, copy, 0, 16 );
-
+
return "'" + StringTools.dumpBytes( copy ) + "...'";
}
else
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/AbstractLdapReferralException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/AbstractLdapReferralException.java?rev=948714&r1=948713&r2=948714&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/AbstractLdapReferralException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/AbstractLdapReferralException.java Thu May 27 08:22:26 2010
@@ -24,7 +24,6 @@ import java.util.Hashtable;
import javax.naming.Context;
import javax.naming.NamingException;
-import javax.naming.ReferralException;
import org.apache.directory.shared.ldap.NotImplementedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -45,13 +44,16 @@ public class AbstractLdapReferralExcepti
/** The remaining DN */
private DN remainingDn;
-
+
/** TODO */
private Object resolvedObject;
/**
- * @see ReferralException#ReferralException(java.lang.String)
+ *
+ * Creates a new instance of AbstractLdapReferralException.
+ *
+ * @param explanation The associated message
*/
public AbstractLdapReferralException( String explanation )
{
@@ -86,8 +88,8 @@ public class AbstractLdapReferralExcepti
{
throw new NotImplementedException();
}
-
-
+
+
/**
* @return the remainingDn
*/
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapPartialResultException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapPartialResultException.java?rev=948714&r1=948713&r2=948714&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapPartialResultException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapPartialResultException.java Thu May 27 08:22:26 2010
@@ -19,10 +19,10 @@
*/
package org.apache.directory.shared.ldap.exception;
-import javax.naming.ReferralException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+
/**
* A {@link LdapOperationException} which associates a resultCode namely the
* {@link ResultCodeEnum#REFERRAL} resultCode with the exception.
@@ -35,8 +35,12 @@ public class LdapPartialResultException
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
- * @see ReferralException#ReferralException(java.lang.String)
+ *
+ * Creates a new instance of LdapPartialResultException.
+ *
+ * @param explanation The associated error message
*/
public LdapPartialResultException( String explanation )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java?rev=948714&r1=948713&r2=948714&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java Thu May 27 08:22:26 2010
@@ -27,7 +27,6 @@ import java.util.List;
import javax.naming.Context;
import javax.naming.NamingException;
-import javax.naming.ReferralException;
import org.apache.directory.shared.ldap.NotImplementedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -51,16 +50,19 @@ public class LdapReferralException exten
/** The current index in the list of referrals */
private int index = 0;
-
+
/** The remaining DN */
private DN remainingDn;
-
+
/** TODO */
private Object resolvedObject;
/**
- * @see ReferralException#ReferralException()
+ *
+ * Creates a new instance of LdapReferralException.
+ *
+ * @param refs The list of referrals
*/
public LdapReferralException( Collection<String> refs )
{
@@ -70,7 +72,11 @@ public class LdapReferralException exten
/**
- * @see ReferralException#ReferralException(java.lang.String)
+ *
+ * Creates a new instance of LdapReferralException.
+ *
+ * @param refs The list of referrals
+ * @param explanation The associated error message
*/
public LdapReferralException( Collection<String> refs, String explanation )
{
@@ -119,8 +125,8 @@ public class LdapReferralException exten
{
throw new NotImplementedException();
}
-
-
+
+
/**
* @return the remainingDn
*/
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapTimeLimitExceededException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapTimeLimitExceededException.java?rev=948714&r1=948713&r2=948714&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapTimeLimitExceededException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapTimeLimitExceededException.java Thu May 27 08:22:26 2010
@@ -20,8 +20,6 @@
package org.apache.directory.shared.ldap.exception;
-import javax.naming.TimeLimitExceededException;
-
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -39,7 +37,9 @@ public class LdapTimeLimitExceededExcept
/**
- * @see TimeLimitExceededException#TimeLimitExceededException()
+ *
+ * Creates a new instance of LdapTimeLimitExceededException.
+ *
*/
public LdapTimeLimitExceededException()
{
@@ -48,7 +48,10 @@ public class LdapTimeLimitExceededExcept
/**
- * @see TimeLimitExceededException#TimeLimitExceededException(String)
+ *
+ * Creates a new instance of LdapTimeLimitExceededException.
+ *
+ * @param explanation The associated error message
*/
public LdapTimeLimitExceededException( String explanation )
{