You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2018/02/10 11:37:09 UTC
svn commit: r1823742 - in /felix/trunk/http/jetty/src:
main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java
Author: cziegeler
Date: Sat Feb 10 11:37:09 2018
New Revision: 1823742
URL: http://svn.apache.org/viewvc?rev=1823742&view=rev
Log:
FELIX-5787 : Wrong port 433 instread of 443 used as default port for https
Modified:
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
felix/trunk/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java
Modified: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java?rev=1823742&r1=1823741&r2=1823742&view=diff
==============================================================================
--- felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java (original)
+++ felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java Sat Feb 10 11:37:09 2018
@@ -56,7 +56,7 @@ class ConfigMetaTypeProvider implements
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 @@ class ConfigMetaTypeProvider implements
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,
Modified: felix/trunk/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java?rev=1823742&r1=1823741&r2=1823742&view=diff
==============================================================================
--- felix/trunk/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java (original)
+++ felix/trunk/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java Sat Feb 10 11:37:09 2018
@@ -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