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/08/30 12:48:14 UTC
[isis] branch master updated: ISIS-1895: polishing
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 405a965 ISIS-1895: polishing
405a965 is described below
commit 405a96584b6bc28600d6210e9809ac69dbb8fc87
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Aug 30 14:48:09 2018 +0200
ISIS-1895: polishing
Task-Url: https://issues.apache.org/jira/browse/ISIS-1895
---
.../core/webapp/modules/WebModule_FallbackBootstrapper.java | 2 +-
.../org/apache/isis/core/webapp/modules/WebModule_Wicket.java | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_FallbackBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_FallbackBootstrapper.java
index e686b16..9f9f132 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_FallbackBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_FallbackBootstrapper.java
@@ -45,7 +45,7 @@ final class WebModule_FallbackBootstrapper implements WebModule {
public boolean isApplicable(ServletContext ctx) {
// not required if another bootstrapper module is on the context
// e.g. the Wicket module
- return ctx.getAttribute("bootstrapper")!=null;
+ return !ContextUtil.hasBootstrapper(ctx);
}
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java
index 8241dca..b2076b5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java
@@ -54,7 +54,7 @@ final class WebModule_Wicket implements WebModule {
@Override
public void prepare(ServletContext ctx) {
- if(!isApplicable(ctx)) {
+ if(!isAvailable()) {
return;
}
@@ -103,6 +103,12 @@ final class WebModule_Wicket implements WebModule {
@Override
public boolean isApplicable(ServletContext ctx) {
+ return isAvailable();
+ }
+
+ // -- HELPER
+
+ private static boolean isAvailable() {
try {
getDefaultClassLoader().loadClass(WICKET_FILTER_CLASS_NAME);
return true;
@@ -111,8 +117,6 @@ final class WebModule_Wicket implements WebModule {
}
}
- // -- HELPER
-
private String getUrlPattern() {
final String wicketPath = getWicketPath();
final String wicketPathEnclosedWithSlashes = suffix(prefix(wicketPath, "/"), "/");