Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 98710 invoked from network); 20 Oct 2007 09:55:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Oct 2007 09:55:24 -0000 Received: (qmail 30154 invoked by uid 500); 20 Oct 2007 09:55:12 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 30143 invoked by uid 99); 20 Oct 2007 09:55:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Oct 2007 02:55:12 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Oct 2007 09:55:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B81131A9832; Sat, 20 Oct 2007 02:55:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r586693 - /db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java Date: Sat, 20 Oct 2007 09:55:01 -0000 To: jdo-commits@db.apache.org From: andyj@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071020095501.B81131A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: andyj Date: Sat Oct 20 02:55:00 2007 New Revision: 586693 URL: http://svn.apache.org/viewvc?rev=586693&view=rev Log: JDO-539 Fix equals of Oid to use equals rather than == for comparing object equality Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java?rev=586693&r1=586692&r2=586693&view=diff ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java Sat Oct 20 02:55:00 2007 @@ -176,8 +176,8 @@ if( obj==null || !this.getClass().equals(obj.getClass()) ) return( false ); Oid o = (Oid) obj; - if( this.person != o.person ) return( false ); - if( this.type != o.type ) return( false ); + if( !this.person.equals(o.person) ) return( false ); + if( !this.type.equals(o.type) ) return( false ); return( true ); }