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/10/31 14:11:01 UTC
[isis] branch v2 updated: ISIS-2158: minor: cleanup
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 3b5116a ISIS-2158: minor: cleanup
3b5116a is described below
commit 3b5116ac9fcd2918e2bc0b4ef4b524e76f0e19d1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 31 15:10:48 2019 +0100
ISIS-2158: minor: cleanup
---
.../java/org/apache/isis/webapp/IsisWebAppContextInitializer.java | 2 +-
.../main/java/org/apache/isis/webapp/modules/WebModuleContext.java | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppContextInitializer.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppContextInitializer.java
index fd55d47..5a1583f 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppContextInitializer.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppContextInitializer.java
@@ -34,7 +34,7 @@ public class IsisWebAppContextInitializer implements ServletContextInitializer {
// holder of ServletContext with one-shot access
public static class ServletContextResource {
private ServletContext servletContext;
- public ServletContext getServletContextTheRemoveReference() {
+ public ServletContext getServletContextOneShot() {
try {
return servletContext;
} finally {
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
index ad6dd57..2267be1 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
@@ -60,10 +60,6 @@ public class WebModuleContext {
private List<WebModule> webModules;
private final List<ServletContextListener> activeListeners = new ArrayList<>();
- public ServletContext getServletContextTheRemoveReference() {
- return servletContextResource.getServletContextTheRemoveReference();
- }
-
/**
* Tell other modules that a bootstrapper is present.
*/
@@ -118,7 +114,7 @@ public class WebModuleContext {
public void init() {
- val event = new ServletContextEvent(getServletContextTheRemoveReference());
+ val event = new ServletContextEvent(servletContextResource.getServletContextOneShot());
webModules.stream()
.filter(module->module.isApplicable(this)) // filter those WebModules that are applicable