(cayenne) branch master updated: CAY-2892 Modeler: Exception when deleting a callback

[aadamchik]

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

asf-gitbox-commits 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 c79bcd374 CAY-2892 Modeler: Exception when deleting a callback
c79bcd374 is described below

commit c79bcd3743ae6a5c5ec32529311e9255376490f7
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Sat Jul 4 15:56:24 2026 -0400

    CAY-2892 Modeler: Exception when deleting a callback
---
 RELEASE-NOTES.txt                                                   | 1 +
 .../project/editor/objentity/callbacks/ObjEntityCallbacksView.java  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 2b29d881c..1550fc2d2 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -26,6 +26,7 @@ CAY-2972 Fewer parentheses in generated SQL
 
 Bug Fixes:
 
+CAY-2892 Modeler: Exception when deleting a callback 
 CAY-2958 Empty join is saved
 CAY-2959 Modeler: DbRelationship dialog "Cancel" doesn't cancel
 CAY-2960 Undoing renamed relationship change throws
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java
index c13497efd..e907e579f 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java
@@ -131,7 +131,7 @@ public class ObjEntityCallbacksView extends ProjectPanel {
                 int row = -1, i;
 
                 for (i = 0; i < callbackTypes.length; i++) {
-                    if (callbackTypes[i] == session.getSelectedCallbackType()) 
{
+                    if 
(callbackTypes[i].equals(session.getSelectedCallbackType())) {
                         row = tables[i].getSelectedRow();
                         break;
                     }
@@ -139,6 +139,10 @@ public class ObjEntityCallbacksView extends ProjectPanel {
 
                 rebuildTables();
 
+                if (i == callbackTypes.length) {
+                    return;
+                }
+
                 if (row == tables[i].getRowCount()) {
                     row--;
                 }