Repository: cayenne Updated Branches: refs/heads/STABLE-4.0 8d4c83abe -> 7a0ec83ba
CAY-2430. Redo throws NPE Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d5f14a8d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d5f14a8d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d5f14a8d Branch: refs/heads/STABLE-4.0 Commit: d5f14a8d16aefd6703531c95e4808cc53fb92d2d Parents: 8d4c83a Author: Arseni Bulatski <ancars...@gmail.com> Authored: Tue Jul 10 10:50:48 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Tue Jul 10 10:50:48 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/d5f14a8d/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 1d85638..69142a7 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -48,6 +48,7 @@ CAY-2405 Broken prefetch of entity with inheritance and attribute with custom ja CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class CAY-2420 Modeler: search is not performed for Stored Procedures CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS +CAY-2430 Redo throws NPE ---------------------------------- Release: 4.0.B2 http://git-wip-us.apache.org/repos/asf/cayenne/blob/d5f14a8d/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; } }
