From c2899c4e6a591e5e5b37739d135392e629e1050d Mon Sep 17 00:00:00 2001 From: Carsten Ziegeler Date: Sat, 10 Feb 2018 11:37:09 +0000 Subject: [PATCH] FELIX-5787 : Wrong port 433 instread of 443 used as default port for https git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1823742 13f79535-47bb-0310-9956-ffa450edef68 --- .../felix/http/jetty/internal/ConfigMetaTypeProvider.java | 6 +++--- .../apache/felix/http/jetty/internal/JettyConfigTest.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java index b4d03e96af2..b581db0e192 100644 --- a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java +++ b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java @@ -56,7 +56,7 @@ public ObjectClassDefinition getObjectClassDefinition( String id, String locale return null; } - final ArrayList adList = new ArrayList(); + final ArrayList adList = new ArrayList<>(); adList.add(new AttributeDefinitionImpl(JettyConfig.FELIX_HOST, "Host Name", @@ -91,8 +91,8 @@ public ObjectClassDefinition getObjectClassDefinition( String id, String locale adList.add(new AttributeDefinitionImpl(JettyConfig.HTTPS_PORT, "HTTPS Port", - "Port to listen on for HTTPS requests. Defaults to 433.", - 433, + "Port to listen on for HTTPS requests. Defaults to 443.", + 443, bundle.getBundleContext().getProperty(JettyConfig.HTTPS_PORT))); adList.add(new AttributeDefinitionImpl(JettyConfig.FELIX_KEYSTORE, diff --git a/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java b/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java index bbec3fb46e5..a6ad78e48e8 100644 --- a/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java +++ b/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java @@ -95,7 +95,7 @@ public class JettyConfigTest props.put("org.osgi.service.http.port.secure", "*"); this.config.update(props); assertTrue(this.config.getHttpPort() != 8080); - assertTrue(this.config.getHttpsPort() != 433); + assertTrue(this.config.getHttpsPort() != 443); } @Test public void testGetRandomPortZero() throws Exception