From commits-return-31277-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Sun Mar 06 00:35:30 2011 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 83439 invoked from network); 6 Mar 2011 00:35:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Mar 2011 00:35:29 -0000 Received: (qmail 87604 invoked by uid 500); 6 Mar 2011 00:35:29 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 87540 invoked by uid 500); 6 Mar 2011 00:35:29 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 87533 invoked by uid 99); 6 Mar 2011 00:35:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Mar 2011 00:35:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Mar 2011 00:35:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E1B8E238899C; Sun, 6 Mar 2011 00:35:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1078394 - in /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap: LdapServer.java handlers/ExtendedHandler.java Date: Sun, 06 Mar 2011 00:35:08 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110306003508.E1B8E238899C@eris.apache.org> Author: seelmann Date: Sun Mar 6 00:35:08 2011 New Revision: 1078394 URL: http://svn.apache.org/viewvc?rev=1078394&view=rev Log: Removed unnecessary generic constructs which caused compiler failure with Java 5. Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=1078394&r1=1078393&r2=1078394&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Sun Mar 6 00:35:08 2011 @@ -186,7 +186,7 @@ public class LdapServer extends Director private LdapRequestHandler bindHandler; private LdapRequestHandler compareHandler; private LdapRequestHandler deleteHandler; - private ExtendedHandler, ExtendedResponse> extendedHandler; + private ExtendedHandler extendedHandler; private LdapRequestHandler modifyHandler; private LdapRequestHandler modifyDnHandler; private LdapRequestHandler searchHandler; @@ -285,7 +285,7 @@ public class LdapServer extends Director if ( getExtendedHandler() == null ) { - setExtendedHandler( new ExtendedHandler, ExtendedResponse>() ); + setExtendedHandler( new ExtendedHandler() ); } if ( getModifyHandler() == null ) @@ -771,7 +771,7 @@ public class LdapServer extends Director * request handler * @return the exnteded operation handler */ - public ExtendedOperationHandler,? extends ExtendedResponse> + public ExtendedOperationHandler,ExtendedResponse> getExtendedOperationHandler( String oid ) { for ( ExtendedOperationHandler, ExtendedResponse> h : extendedOperationHandlers ) @@ -1136,7 +1136,7 @@ public class LdapServer extends Director * @param extendedHandler The ExtendedRequest handler */ @SuppressWarnings({ "unchecked", "rawtypes" }) - public void setExtendedHandler( ExtendedHandler, ExtendedResponse> extendedHandler ) + public void setExtendedHandler( ExtendedHandler extendedHandler ) { this.handler.removeReceivedMessageHandler( ExtendedRequest.class ); this.extendedHandler = extendedHandler; Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java?rev=1078394&r1=1078393&r2=1078394&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java Sun Mar 6 00:35:08 2011 @@ -34,13 +34,11 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class ExtendedHandler, R extends ExtendedResponse> extends LdapRequestHandler +public class ExtendedHandler extends LdapRequestHandler> { - public void handle( LdapSession session, Q req ) throws Exception + public void handle( LdapSession session, ExtendedRequest req ) throws Exception { - @SuppressWarnings("unchecked") - ExtendedOperationHandler handler = - ( ExtendedOperationHandler ) getLdapServer().getExtendedOperationHandler( req.getRequestName() ); + ExtendedOperationHandler, ExtendedResponse> handler = getLdapServer().getExtendedOperationHandler( req.getRequestName() ); if ( handler == null ) {