Repository: cayenne Updated Branches: refs/heads/master d2fb2de46 -> fed6bcb95
CAY-2430 Fixed NPE on redo delete procedure action. Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cf2a1a06 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cf2a1a06 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cf2a1a06 Branch: refs/heads/master Commit: cf2a1a060444a3717bf8c8f1d1dee1163e5dbbed Parents: d2fb2de Author: kkomyak <const1...@gmail.com> Authored: Thu Apr 12 09:20:03 2018 +0300 Committer: kkomyak <const1...@gmail.com> Committed: Thu Apr 19 10:35:29 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + .../java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/cf2a1a06/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 6440065..99cc961 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -35,6 +35,7 @@ CAY-2414 Modeler: new icon design CAY-2415 Transaction isolation and propagation support CAY-2416 Change TreeMap for HashMap to store data in Cayenne model classes CAY-2422 Modeler: Open driver setup window on driver load error +CAY-2430 Modeler: Redo throws NPE Bug Fixes: http://git-wip-us.apache.org/repos/asf/cayenne/blob/cf2a1a06/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java index fd22b74..fe662b2 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java @@ -211,6 +211,7 @@ public class RemoveUndoableEdit extends CayenneUndoableEdit { break; case PROCEDURE: action.removeProcedure(map, procedure); + break; case MAP_FROM_NODE: action.removeDataMapFromDataNode(dataNode, map); break; @@ -222,6 +223,7 @@ public class RemoveUndoableEdit extends CayenneUndoableEdit { break; case EMBEDDABLE: action.removeEmbeddable(map, embeddable); + break; } }
