(cayenne) branch master updated: CAY-2851 Replace Existing OneToOne From New Object

[ntimofeev]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new e33527a95 CAY-2851 Replace Existing OneToOne From New Object
e33527a95 is described below

commit e33527a958caac90f3216a89474e16509b2cfcc7
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Wed Jun 12 12:05:26 2024 +0400

    CAY-2851 Replace Existing OneToOne From New Object
---
 cayenne/src/main/java/org/apache/cayenne/PersistentObject.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cayenne/src/main/java/org/apache/cayenne/PersistentObject.java 
b/cayenne/src/main/java/org/apache/cayenne/PersistentObject.java
index 9b1a30af3..f35b0e506 100644
--- a/cayenne/src/main/java/org/apache/cayenne/PersistentObject.java
+++ b/cayenne/src/main/java/org/apache/cayenne/PersistentObject.java
@@ -480,7 +480,7 @@ public abstract class PersistentObject implements 
Persistent, Validating {
         ObjRelationship revRel = rel.getReverseRelationship();
         if (revRel != null) {
             Object oldTarget = val.readProperty(revRel.getName());
-            if (oldTarget != val && oldTarget instanceof Persistent && val 
instanceof PersistentObject) {
+            if (oldTarget != this && oldTarget instanceof Persistent && val 
instanceof PersistentObject) {
                 
((PersistentObject)val).unsetReverseRelationship(revRel.getName(), (Persistent) 
oldTarget);
             }
             if (revRel.isToMany()) {