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 2018/10/11 11:24:11 UTC
[isis] branch v2 updated: ISIS-1767: fixes class-loading issues on
JEE
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new ed4ae66 ISIS-1767: fixes class-loading issues on JEE
ed4ae66 is described below
commit ed4ae6668e7e30ed2f313df7058a5a6078f6fc16
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 11 13:23:58 2018 +0200
ISIS-1767: fixes class-loading issues on JEE
Task-Url: https://issues.apache.org/jira/browse/ISIS-1767
---
.../src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java | 4 +---
.../apache/isis/core/metamodel/specloader/SpecificationLoader.java | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java
index 0470ccb..972ac6a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java
@@ -108,8 +108,6 @@ public final class ClassUtil {
// //////////////////////////////////////
-
-
private ClassUtil() {
}
@@ -128,7 +126,7 @@ public final class ClassUtil {
}
Class<?> classCandidate = null;
try {
- classCandidate = Class.forName(classCandidateName);
+ classCandidate = _Context.loadClass(classCandidateName);
return ClassExtensions.implementingClassOrNull(classCandidate, requiredClass, constructorParamType);
} catch (final ClassNotFoundException e) {
return null;
diff --git 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
index fafcd4b..a171c51 100644
--- 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
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
-import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -511,7 +510,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
if (builtIn != null) {
return builtIn;
}
- return Class.forName(className);
+ return ClassUtil.forName(className);
}
/**