You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/03/04 18:14:37 UTC

[2/2] isis git commit: ISIS-1065: ensure all properties are audited when object updated using edit properties form.

ISIS-1065: ensure all properties are audited when object updated using edit properties form.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/870d1880
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/870d1880
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/870d1880

Branch: refs/heads/master
Commit: 870d1880a9180eec42a98416ea4d363371b28d93
Parents: f800860
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Mar 4 00:55:03 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Mar 4 00:55:03 2015 +0000

----------------------------------------------------------------------
 .../runtime/system/transaction/IsisTransaction.java     | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/870d1880/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 81da37a..b53110b 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
@@ -1282,6 +1282,10 @@ public class IsisTransaction implements TransactionScopedComponent {
             if(property.isNotPersisted()) {
                 continue;
             }
+            if(changedObjectProperties.containsKey(aap)) {
+                // already enlisted, so ignore
+                return;
+            }
             PreAndPostValues papv = PreAndPostValues.pre(Placeholder.NEW);
             changedObjectProperties.put(aap, papv);
         }
@@ -1305,6 +1309,10 @@ public class IsisTransaction implements TransactionScopedComponent {
             if(property.isNotPersisted()) {
                 continue;
             }
+            if(changedObjectProperties.containsKey(aap)) {
+                // already enlisted, so ignore
+                return;
+            }
             PreAndPostValues papv = PreAndPostValues.pre(aap.getPropertyValue());
             changedObjectProperties.put(aap, papv);
         }
@@ -1328,6 +1336,10 @@ public class IsisTransaction implements TransactionScopedComponent {
             if(property.isNotPersisted()) {
                 continue;
             }
+            if(changedObjectProperties.containsKey(aap)) {
+                // already enlisted, so ignore
+                return;
+            }
             PreAndPostValues papv = PreAndPostValues.pre(aap.getPropertyValue());
             changedObjectProperties.put(aap, papv);
         }