Updated Branches: refs/heads/master 175cd5cbc -> c99690c2a
ISIS-408: auditing ignore non-persisted fields; + trivial change. (also trivial: removed 'final' from AbstractContainedObject, to support pluggable factories in repos). Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c99690c2 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c99690c2 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c99690c2 Branch: refs/heads/master Commit: c99690c2a1bc7a5c63e428c3f45c645a0416998f Parents: 175cd5c Author: Dan Haywood <[email protected]> Authored: Sun May 19 17:19:13 2013 +0100 Committer: Dan Haywood <[email protected]> Committed: Sun May 19 17:19:13 2013 +0100 ---------------------------------------------------------------------- .../isis/applib/AbstractContainedObject.java | 2 +- .../system/transaction/IsisTransaction.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/c99690c2/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java ---------------------------------------------------------------------- diff --git a/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java b/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java index 65bdc61..ec61234 100644 --- a/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java +++ b/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java @@ -319,7 +319,7 @@ public abstract class AbstractContainedObject { * * @uml.property name="container" */ - public final void setContainer(final DomainObjectContainer container) { + public void setContainer(final DomainObjectContainer container) { this.container = container; } // }} http://git-wip-us.apache.org/repos/asf/isis/blob/c99690c2/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java index 162a526..f4b91b5 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java @@ -860,6 +860,9 @@ public class IsisTransaction implements TransactionScopedComponent { enlist(adapter, ChangeKind.CREATE); for (ObjectAssociation property : adapter.getSpecification().getAssociations(ObjectAssociationFilters.PROPERTIES)) { final AdapterAndProperty aap = AdapterAndProperty.of(adapter, property); + if(property.isNotPersisted()) { + continue; + } PreAndPostValues papv = PreAndPostValues.pre("[NEW]"); changedObjectProperties.put(aap, papv); } @@ -880,6 +883,9 @@ public class IsisTransaction implements TransactionScopedComponent { enlist(adapter, ChangeKind.UPDATE); for (ObjectAssociation property : adapter.getSpecification().getAssociations(ObjectAssociationFilters.PROPERTIES)) { final AdapterAndProperty aap = AdapterAndProperty.of(adapter, property); + if(property.isNotPersisted()) { + continue; + } PreAndPostValues papv = PreAndPostValues.pre(aap.getPropertyValue()); changedObjectProperties.put(aap, papv); } @@ -900,6 +906,9 @@ public class IsisTransaction implements TransactionScopedComponent { enlist(adapter, ChangeKind.DELETE); for (ObjectAssociation property : adapter.getSpecification().getAssociations(ObjectAssociationFilters.PROPERTIES)) { final AdapterAndProperty aap = AdapterAndProperty.of(adapter, property); + if(property.isNotPersisted()) { + continue; + } PreAndPostValues papv = PreAndPostValues.pre(aap.getPropertyValue()); changedObjectProperties.put(aap, papv); }
