Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 27611 invoked from network); 26 Aug 2004 16:51:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 26 Aug 2004 16:51:05 -0000 Received: (qmail 39707 invoked by uid 500); 26 Aug 2004 16:51:04 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 39663 invoked by uid 500); 26 Aug 2004 16:51:04 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk Reply-To: directory-dev@incubator.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list directory-cvs@incubator.apache.org Received: (qmail 39650 invoked by uid 99); 26 Aug 2004 16:51:03 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Thu, 26 Aug 2004 09:51:03 -0700 Received: (qmail 27564 invoked by uid 65534); 26 Aug 2004 16:51:03 -0000 Date: 26 Aug 2004 16:51:03 -0000 Message-ID: <20040826165103.27561.qmail@minotaur.apache.org> From: akarasulu@apache.org To: directory-cvs@incubator.apache.org Subject: svn commit: rev 37090 - in incubator/directory/ldap/trunk/common/src: java/org/apache/ldap/common/message test/org/apache/ldap/common/message X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Thu Aug 26 09:51:02 2004 New Revision: 37090 Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/message/ExtendedRequestImpl.java incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/message/ExtendedRequestImplTest.java Log: fixed a few bugs for ExtendedRequestImpl and its test Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/message/ExtendedRequestImpl.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/message/ExtendedRequestImpl.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/message/ExtendedRequestImpl.java Thu Aug 26 09:51:02 2004 @@ -142,9 +142,22 @@ } ExtendedRequest req = ( ExtendedRequest ) obj; - if ( ! oid.equals( req.getOid() ) ) + if ( oid != null && req.getOid() == null ) { return false; + } + + if ( oid == null && req.getOid() != null ) + { + return false; + } + + if ( oid != null && req.getOid() != null ) + { + if ( ! oid.equals( req.getOid() ) ) + { + return false; + } } if ( payload != null && req.getPayload() == null ) Modified: incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/message/ExtendedRequestImplTest.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/message/ExtendedRequestImplTest.java (original) +++ incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/message/ExtendedRequestImplTest.java Thu Aug 26 09:51:02 2004 @@ -55,8 +55,8 @@ req0.setPayload( "Hello World!".getBytes() ); ExtendedRequestImpl req1 = new ExtendedRequestImpl( 5 ); - req0.setOid( "1.1.1.1" ); - req0.setPayload( "Hello World!".getBytes() ); + req1.setOid( "1.1.1.1" ); + req1.setPayload( "Hello World!".getBytes() ); assertTrue( req0.equals( req1 ) ); assertTrue( req1.equals( req0 ) ); @@ -130,7 +130,7 @@ public byte[] getPayload() { - return new byte[0]; + return null; } public void setPayload( byte[] payload ) @@ -139,7 +139,7 @@ public MessageTypeEnum getResponseType() { - return MessageTypeEnum.COMPARERESPONSE; + return MessageTypeEnum.EXTENDEDRESP; } public boolean hasResponse() @@ -149,7 +149,7 @@ public MessageTypeEnum getType() { - return MessageTypeEnum.COMPAREREQUEST; + return MessageTypeEnum.EXTENDEDREQ; } public Collection getControls()