You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/12/21 17:18:07 UTC
[isis] branch master updated: ISIS-2033: cleanup
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 235e8d0 ISIS-2033: cleanup
235e8d0 is described below
commit 235e8d09e0f7c03c7397ead9b33b37e9da8f4c64
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Dec 21 18:17:53 2020 +0100
ISIS-2033: cleanup
---
.../isis/core/runtimeservices/xactn/TransactionServiceSpring.java | 6 +++++-
.../extensions/commandreplay/secondary/fetch/CommandFetcher.java | 1 -
.../secondary/jobcallables/ReplicateAndRunCommands.java | 1 -
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xactn/TransactionServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xactn/TransactionServiceSpring.java
index 1fd290a..1f85a9f 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xactn/TransactionServiceSpring.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xactn/TransactionServiceSpring.java
@@ -127,7 +127,11 @@ public class TransactionServiceSpring implements TransactionService {
public <T> Result<T> executeWithinTransaction(final @NonNull Callable<T> callable) {
if(currentTransactionState() != TransactionState.NONE) {
- return Result.of(callable);
+ Result.of(()->{
+ val t = callable.call();
+ flushTransaction();
+ return t;
+ });
}
return Result.of(()->executeWithinNewTransaction(callable));
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
index 2d1d73f..6544245 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
@@ -21,7 +21,6 @@ package org.apache.isis.extensions.commandreplay.secondary.fetch;
import java.net.URI;
import java.util.Collections;
import java.util.List;
-import java.util.Optional;
import java.util.UUID;
import javax.annotation.Nullable;
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.java
index d6f5f1e..b9c1aa3 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.java
@@ -35,7 +35,6 @@ import org.apache.isis.extensions.commandreplay.secondary.StatusException;
import org.apache.isis.extensions.commandreplay.secondary.analysis.CommandReplayAnalysisService;
import org.apache.isis.extensions.commandreplay.secondary.fetch.CommandFetcher;
import org.apache.isis.extensions.commandreplay.secondary.spi.ReplayCommandExecutionController;
-import org.apache.isis.schema.cmd.v2.CommandDto;
import lombok.val;
import lombok.extern.log4j.Log4j2;