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 2019/01/09 18:05:19 UTC
[isis] branch 2033-IoC updated (22139d5 -> 45e790f)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 22139d5 ISIS-2033: fixes provisioning of PersistenceSesionFactory
add 9ddf88e ISIS-2082: let ThreadPoolSupport.HIGHEST_CONCURRENCY_EXECUTION_MODE_ALLOWED act as an upper bound for the concurrency level supported by ThreadPoolSupport
add 795745c ISIS-2082: fix and simplify upper-bound check for concurrency level
new 45e790f merge 'v2' into '2033-IoC'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../metamodel/specloader/SpecificationLoader.java | 11 +-
.../threadpool/ThreadPoolExecutionMode.java | 65 ++++++++++
.../core/runtime/threadpool/ThreadPoolSupport.java | 133 +++++++++++++++------
.../runtime/threadpool/ThreadPoolSupportTest.java | 15 ++-
.../system/session/IsisSessionFactoryBuilder.java | 4 +-
.../wicket/viewer/IsisWicketApplication.java | 5 +-
6 files changed, 185 insertions(+), 48 deletions(-)
create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/runtime/threadpool/ThreadPoolExecutionMode.java
[isis] 01/01: merge 'v2' into '2033-IoC'
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 45e790f435f6e7d3a9858743eb9433cef090dbaa
Merge: 22139d5 795745c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 9 19:05:07 2019 +0100
merge 'v2' into '2033-IoC'
.../metamodel/specloader/SpecificationLoader.java | 11 +-
.../threadpool/ThreadPoolExecutionMode.java | 65 ++++++++++
.../core/runtime/threadpool/ThreadPoolSupport.java | 133 +++++++++++++++------
.../runtime/threadpool/ThreadPoolSupportTest.java | 15 ++-
.../system/session/IsisSessionFactoryBuilder.java | 4 +-
.../wicket/viewer/IsisWicketApplication.java | 5 +-
6 files changed, 185 insertions(+), 48 deletions(-)
diff --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index 60a8b11,f91dd60..d078e9d
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@@ -268,9 -272,13 +269,13 @@@ public class SpecificationLoader
private void invokeAndWait(final List<Callable<Object>> callables) {
final ThreadPoolSupport threadPoolSupport = ThreadPoolSupport.getInstance();
final boolean parallelize = CONFIG_PROPERTY_PARALLELIZE.from(getConfiguration());
- final List<Future<Object>> futures = parallelize
- ? threadPoolSupport.invokeAll(callables)
- : threadPoolSupport.invokeAllSequential(callables);
-
++
+ final ThreadPoolExecutionMode executionModeFromConfig = parallelize
+ ? ThreadPoolExecutionMode.PARALLEL
+ : ThreadPoolExecutionMode.SEQUENTIAL;
+
+ final List<Future<Object>> futures =
+ threadPoolSupport.invokeAll(executionModeFromConfig, callables);
threadPoolSupport.joinGatherFailures(futures);
}
diff --cc core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index a0738a9,0c602bf..0a15eda
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@@ -20,7 -20,8 +20,8 @@@
package org.apache.isis.viewer.wicket.viewer;
import java.io.IOException;
-import java.net.URL;
+import java.nio.charset.StandardCharsets;
+ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.ServiceLoader;