| commit | 1c5065e6534474f853d72e302c22947795596e79 | [log] [tgz] |
|---|---|---|
| author | Carsten Ziegeler <cziegeler@apache.org> | Fri Feb 20 15:21:46 2015 +0000 |
| committer | Carsten Ziegeler <cziegeler@apache.org> | Fri Feb 20 15:21:46 2015 +0000 |
| tree | 21475fbaf4ceba468bbb69d8ecc9072935e7f775 | |
| parent | 5639148d9b562783efabd9b782283d8a68bcb69f [diff] |
FELIX-4060 : Fix restarting of container git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1661138 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java b/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java index c3af022..d81239b 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
@@ -91,6 +91,8 @@ public void register(final ServletContext servletContext) { + this.registry.init(); + this.plugin.register(); this.httpServiceFactory.start(servletContext);
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/handler/HandlerRegistry.java b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/HandlerRegistry.java index 3f65777..9f5b614 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/handler/HandlerRegistry.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/HandlerRegistry.java
@@ -41,10 +41,9 @@ private volatile List<PerContextHandlerRegistry> registrations = Collections.emptyList(); /** - * Create a new registry. * Register default context registry for Http Service */ - public HandlerRegistry() + public void init() { this.add(new PerContextHandlerRegistry()); }