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 2016/04/22 11:47:46 UTC
[11/14] isis git commit: ISIS-1374: ditto.
ISIS-1374: ditto.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7c379667
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7c379667
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7c379667
Branch: refs/heads/ISIS-1291
Commit: 7c3796674bba8859c8c16d5819706b8c5558aae4
Parents: d605797
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Apr 21 16:25:39 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 21 16:25:39 2016 +0100
----------------------------------------------------------------------
.../ActionInvocationFacetForDomainEventAbstract.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7c379667/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 8981bfc..4d1485f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -431,16 +431,19 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
LOG.debug(" action result " + result);
}
if (result == null) {
-
+
if(targetAdapter.getSpecification().isViewModelCloneable(targetAdapter)) {
// if this was a void method on cloneable view model, then (to save boilerplate in the domain)
// automatically do the clone and return the clone instead.
final ViewModelFacet facet = targetAdapter.getSpecification().getFacet(ViewModelFacet.class);
final Object clone = facet.clone(targetAdapter.getObject());
final ObjectAdapter clonedAdapter = getAdapterManager().adapterFor(clone);
- return InvocationResult.forActionThatReturned(clonedAdapter);
+
+ resultAdapter = clonedAdapter;
+
+ } else {
+ resultAdapter = null;
}
- resultAdapter = null;
} else {