diff options
| author | Anjum Fatima | 2019-10-15 19:11:17 +0000 |
|---|---|---|
| committer | Anjum Fatima | 2019-10-15 20:06:44 +0000 |
| commit | 12adf9d240b24cf478eb52768b3b67ae7e5942a7 (patch) | |
| tree | 86bcd26dd5e5353c3cce7d12c51a24177e978a68 | |
| parent | c7ed63f62e43b59ac17849fe85fefbccbc984e05 (diff) | |
| download | rt.equinox.bundles-12adf9d240b24cf478eb52768b3b67ae7e5942a7.tar.gz rt.equinox.bundles-12adf9d240b24cf478eb52768b3b67ae7e5942a7.tar.xz rt.equinox.bundles-12adf9d240b24cf478eb52768b3b67ae7e5942a7.zip | |
Bug 551957 - Two equinox.http.servlet.tests fail since I20191007-0625I20191016-1800I20191015-1800
Change-Id: Iefd9b6b354445ae4ac50af174b9b05fb228f9210
Signed-off-by: Anjum Fatima <anjum.eclipse@gmail.com>
3 files changed, 4 insertions, 10 deletions
diff --git a/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF index 746224355..8cd4fd779 100644 --- a/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %bundleName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.equinox.http.jetty -Bundle-Version: 3.7.200.qualifier +Bundle-Version: 3.7.300.qualifier Bundle-Activator: org.eclipse.equinox.http.jetty.internal.Activator Import-Package: javax.servlet;version="[3.1.0,5.0.0)", javax.servlet.http;version="[3.1.0,5.0.0)", diff --git a/bundles/org.eclipse.equinox.http.jetty/pom.xml b/bundles/org.eclipse.equinox.http.jetty/pom.xml index 7714daeca..4902ea989 100644 --- a/bundles/org.eclipse.equinox.http.jetty/pom.xml +++ b/bundles/org.eclipse.equinox.http.jetty/pom.xml @@ -21,6 +21,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.http.jetty</artifactId> - <version>3.7.200-SNAPSHOT</version> + <version>3.7.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java b/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java index 65c370859..64808ff9b 100644 --- a/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java +++ b/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java @@ -150,16 +150,10 @@ public class HttpServerManager implements ManagedServiceFactory { if (null != customizer) httpContext = (ServletContextHandler) customizer.customizeContext(httpContext, dictionary); - SessionHandler sessionManager = httpContext.getSessionHandler(); - try { - sessionManager.addEventListener((HttpSessionIdListener) holder.getServlet()); - } catch (ServletException e) { - throw new ConfigurationException(pid, e.getMessage(), e); - } - try { server.start(); - + SessionHandler sessionManager = httpContext.getSessionHandler(); + sessionManager.addEventListener((HttpSessionIdListener) holder.getServlet()); HouseKeeper houseKeeper = server.getSessionIdManager().getSessionHouseKeeper(); houseKeeper.setIntervalSec(Details.getLong(dictionary, JettyConstants.HOUSEKEEPER_INTERVAL, houseKeeper.getIntervalSec())); } catch (Exception e) { |