Return-Path: Delivered-To: apmail-db-ojb-dev-archive@www.apache.org Received: (qmail 50143 invoked from network); 15 May 2007 15:23:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 May 2007 15:23:43 -0000 Received: (qmail 5258 invoked by uid 500); 15 May 2007 15:23:49 -0000 Delivered-To: apmail-db-ojb-dev-archive@db.apache.org Received: (qmail 5235 invoked by uid 500); 15 May 2007 15:23:49 -0000 Mailing-List: contact ojb-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "OJB Developers List" Reply-To: "OJB Developers List" Delivered-To: mailing list ojb-dev@db.apache.org Received: (qmail 5224 invoked by uid 500); 15 May 2007 15:23:49 -0000 Received: (qmail 5221 invoked by uid 99); 15 May 2007 15:23:49 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 May 2007 08:23:49 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Tue, 15 May 2007 08:23:42 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id EE2D31A983E; Tue, 15 May 2007 08:23:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r538208 - /db/ojb/trunk/src/java/org/apache/ojb/odmg/Image.java Date: Tue, 15 May 2007 15:23:21 -0000 To: ojb-commits@db.apache.org From: arminw@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070515152321.EE2D31A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: arminw Date: Tue May 15 08:23:21 2007 New Revision: 538208 URL: http://svn.apache.org/viewvc?view=rev&rev=538208 Log: update tests, modify test classes Modified: db/ojb/trunk/src/java/org/apache/ojb/odmg/Image.java Modified: db/ojb/trunk/src/java/org/apache/ojb/odmg/Image.java URL: http://svn.apache.org/viewvc/db/ojb/trunk/src/java/org/apache/ojb/odmg/Image.java?view=diff&rev=538208&r1=538207&r2=538208 ============================================================================== --- db/ojb/trunk/src/java/org/apache/ojb/odmg/Image.java (original) +++ db/ojb/trunk/src/java/org/apache/ojb/odmg/Image.java Tue May 15 08:23:21 2007 @@ -355,7 +355,7 @@ void referenceProcessing(final Image oldImage) { SingleRef oldRef = (SingleRef) oldImage; - boolean isSame = getReferenceObjectOrProxy() == oldRef.getReferenceObjectOrProxy(); + boolean isSame = referenceObjOrProxy == oldRef.referenceObjOrProxy; if(!isSame) { Identity newOid = getIdentity(); @@ -364,21 +364,21 @@ { if(oldOid != null) { - listener.deletedOneToOne(ord, oldRef.getReferenceObjectOrProxy(), oldOid, true); + listener.deletedOneToOne(ord, oldRef.referenceObjOrProxy, oldOid, true); } } else { if(oldOid == null) { - listener.addedOneToOne(ord, getReferenceObjectOrProxy(), newOid); + listener.addedOneToOne(ord, referenceObjOrProxy, newOid); } else { if(!newOid.equals(oldOid)) { - listener.deletedOneToOne(ord, oldRef.getReferenceObjectOrProxy(), oldOid, false); - listener.addedOneToOne(ord, getReferenceObjectOrProxy(), newOid); + listener.deletedOneToOne(ord, oldRef.referenceObjOrProxy, oldOid, false); + listener.addedOneToOne(ord, referenceObjOrProxy, newOid); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org For additional commands, e-mail: ojb-dev-help@db.apache.org