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@1823743 13f79535-47bb-0310-9956-ffa450edef68
apache · Feb 10, 2018 · 1cc1298 · 1cc1298
1 parent c2899c4
commit 1cc1298
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -56,7 +56,7 @@ public ObjectClassDefinition getObjectClassDefinition( String id, String locale
             return null;
         }
 
-        final ArrayList<AttributeDefinition> adList = new ArrayList<AttributeDefinition>();
+        final ArrayList<AttributeDefinition> 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/osgi-r7/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java b/osgi-r7/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