[felix-dev] branch master updated: FELIX-6394 : Update Jetty to 9.4.38.v20210224

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new bfeba55  FELIX-6394 : Update Jetty to 9.4.38.v20210224
bfeba55 is described below

commit bfeba558d85493cef796395c1e06b9d6a77dee5a
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Mon Mar 15 07:35:19 2021 +0100

    FELIX-6394 : Update Jetty to 9.4.38.v20210224
---
 http/jetty/pom.xml                                                    | 2 +-
 .../src/main/java/org/apache/felix/http/jetty/ConnectorFactory.java   | 1 +
 .../main/java/org/apache/felix/http/jetty/internal/JettyService.java  | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index ab37d2f..19eab2c 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -42,7 +42,7 @@
     
     <properties>
         <felix.java.version>8</felix.java.version>
-        <jetty.version>9.4.35.v20201120</jetty.version>
+        <jetty.version>9.4.38.v20210224</jetty.version>
     </properties>
 
     <build>
diff --git 
a/http/jetty/src/main/java/org/apache/felix/http/jetty/ConnectorFactory.java 
b/http/jetty/src/main/java/org/apache/felix/http/jetty/ConnectorFactory.java
index 5de3a84..13a5c5c 100644
--- a/http/jetty/src/main/java/org/apache/felix/http/jetty/ConnectorFactory.java
+++ b/http/jetty/src/main/java/org/apache/felix/http/jetty/ConnectorFactory.java
@@ -52,6 +52,7 @@ public interface ConnectorFactory
      * active in Jetty servers must be stopped and removed from these Jetty
      * servers.
      *
+     * @param server The Jetty server object
      * @return A configured Jetty {@code Connector} instance.
      */
     Connector createConnector(Server server);
diff --git 
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
 
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
index a067dde..d887ef3 100644
--- 
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
+++ 
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
@@ -454,7 +454,7 @@ public final class JettyService extends 
AbstractLifeCycle.AbstractLifeCycleListe
         HttpConnectionFactory connFactory = new HttpConnectionFactory();
         configureHttpConnectionFactory(connFactory);
 
-        SslContextFactory sslContextFactory = new SslContextFactory.Server();
+        SslContextFactory.Server sslContextFactory = new 
SslContextFactory.Server();
         configureSslContextFactory(sslContextFactory);
 
         ServerConnector connector = new ServerConnector(
@@ -498,7 +498,7 @@ public final class JettyService extends 
AbstractLifeCycle.AbstractLifeCycleListe
         return startConnector(connector);
     }
 
-    private void configureSslContextFactory(final SslContextFactory connector)
+    private void configureSslContextFactory(final SslContextFactory.Server 
connector)
     {
         if (this.config.getKeystoreType() != null)
         {