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/01/10 12:35:16 UTC
[isis] branch master updated: ISIS-2158: fix WebModuleH2Console
after previous commit broke it
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 f3f291a ISIS-2158: fix WebModuleH2Console after previous commit broke it
f3f291a is described below
commit f3f291afa75891f89bca88d71dd99bd90f9ea23a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 10 13:35:08 2020 +0100
ISIS-2158: fix WebModuleH2Console after previous commit broke it
---
.../isis/testing/h2console/ui/webmodule/WebModuleH2Console.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
index 7aa48b2..17f77c0 100644
--- a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
+++ b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.testing.h2console.ui.webmodule;
-import java.util.List;
-
import javax.inject.Inject;
import javax.inject.Named;
import javax.servlet.ServletContext;
@@ -34,6 +32,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.value.LocalResourcePath;
+import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
@@ -78,7 +77,7 @@ public class WebModuleH2Console extends WebModuleAbstract {
@Override
- public List<ServletContextListener> init(final ServletContext ctx) throws ServletException {
+ public Can<ServletContextListener> init(final ServletContext ctx) throws ServletException {
registerServlet(ctx, SERVLET_NAME, WebServlet.class)
.ifPresent(servletReg -> {
@@ -86,7 +85,7 @@ public class WebModuleH2Console extends WebModuleAbstract {
servletReg.setInitParameter("webAllowOthers", "true");
});
- return null; // does not provide a listener
+ return Can.empty(); // registers no listeners
}
@Override