Skip to content

Commit c79bcd3

Browse files
committed
CAY-2892 Modeler: Exception when deleting a callback
1 parent e616fc6 commit c79bcd3

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ CAY-2972 Fewer parentheses in generated SQL
2626

2727
Bug Fixes:
2828

29+
CAY-2892 Modeler: Exception when deleting a callback
2930
CAY-2958 Empty join is saved
3031
CAY-2959 Modeler: DbRelationship dialog "Cancel" doesn't cancel
3132
CAY-2960 Undoing renamed relationship change throws

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,18 @@ public void callbackMethodRemoved(CallbackMethodEvent e) {
131131
int row = -1, i;
132132

133133
for (i = 0; i < callbackTypes.length; i++) {
134-
if (callbackTypes[i] == session.getSelectedCallbackType()) {
134+
if (callbackTypes[i].equals(session.getSelectedCallbackType())) {
135135
row = tables[i].getSelectedRow();
136136
break;
137137
}
138138
}
139139

140140
rebuildTables();
141141

142+
if (i == callbackTypes.length) {
143+
return;
144+
}
145+
142146
if (row == tables[i].getRowCount()) {
143147
row--;
144148
}

0 commit comments

Comments
 (0)