directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1067035 - in /directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec: BasicControlDecorator.java DefaultLdapCodecService.java
Date Thu, 03 Feb 2011 23:50:22 GMT
Author: akarasulu
Date: Thu Feb  3 23:50:22 2011
New Revision: 1067035

URL: http://svn.apache.org/viewvc?rev=1067035&view=rev
Log:
fixing issue with using abstract control with basic decorator

Modified:
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java?rev=1067035&r1=1067034&r2=1067035&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java
(original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java
Thu Feb  3 23:50:22 2011
@@ -27,6 +27,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecorator;
+import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.controls.AbstractControl;
 
 
@@ -39,7 +40,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class BasicControlDecorator extends ControlDecorator<AbstractControl>
+public class BasicControlDecorator<E> extends ControlDecorator<Control>
 {
     /**
      * Creates a new instance of BasicControlDecorator, decorating a 
@@ -48,7 +49,7 @@ public class BasicControlDecorator exten
      * @param codec The LDAP codec service.
      * @param control The {@link AbstractControl} to decorate.
      */
-    public BasicControlDecorator( ILdapCodecService codec, AbstractControl control )
+    public BasicControlDecorator( ILdapCodecService codec, Control control )
     {
         super( codec, control );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java?rev=1067035&r1=1067034&r2=1067035&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java
(original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java
Thu Feb  3 23:50:22 2011
@@ -243,7 +243,7 @@ public class DefaultLdapCodecService imp
             
             if ( factory == null )
             {
-                return new BasicControlDecorator( this, (AbstractControl)control ); 
+                return new BasicControlDecorator( this, control ); 
             }
             
             return factory.decorate( control );



Mime
View raw message