| commit | 6c8ddf13c2597ff35c03e116ae4b78c1f623d56f | [log] [tgz] |
|---|---|---|
| author | Raymond Auge <raymond.auge@liferay.com> | Mon Jan 09 15:31:40 2017 -0500 |
| committer | Raymond Auge <raymond.auge@liferay.com> | Mon Jan 09 15:31:40 2017 -0500 |
| tree | 6bb3df0f075d28b13d115ea6f213911d19a58246 | |
| parent | de7301522786b873b7689e613feeba768ab91040 [diff] |
Bug 506091 - [http] Can't configure both http and https Signed-off-by: Raymond Auge <raymond.auge@liferay.com>
diff --git a/bundles/org.eclipse.equinox.http.jetty9/src/org/eclipse/equinox/http/jetty/internal/Activator.java b/bundles/org.eclipse.equinox.http.jetty9/src/org/eclipse/equinox/http/jetty/internal/Activator.java index 4ccd799..f9e59b2 100644 --- a/bundles/org.eclipse.equinox.http.jetty9/src/org/eclipse/equinox/http/jetty/internal/Activator.java +++ b/bundles/org.eclipse.equinox.http.jetty9/src/org/eclipse/equinox/http/jetty/internal/Activator.java
@@ -134,7 +134,7 @@ if (httpsEnabled.booleanValue()) { // HTTPS Port - int httpsPort = Details.getIntProp(context, JettyConstants.HTTP_PORT, -1); + int httpsPort = Details.getIntProp(context, JettyConstants.HTTPS_PORT, -1); if (httpsPort == -1) httpsPort = Details.getInt(context, ORG_OSGI_SERVICE_HTTP_PORT_SECURE, 443); defaultSettings.put(JettyConstants.HTTPS_PORT, Integer.valueOf(httpsPort));