[cxf] branch master updated: Configure sendServerVersion for OSGi/Blueprint

[coheigea]

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

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new b9380e9  Configure sendServerVersion for OSGi/Blueprint
b9380e9 is described below

commit b9380e98129bcbdc5d3f6e8f4efac5949df70f25
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Mar 10 09:45:52 2020 +0000

    Configure sendServerVersion for OSGi/Blueprint
---
 .../http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java      | 4 +++-
 .../cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java    | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
index e20982f..4bbd702 100644
--- 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
+++ 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
@@ -146,7 +146,9 @@ public class JettyHTTPServerEngineFactoryHolder {
                 if (engine.isContinuationsEnabled() != null) {
                     
eng.setContinuationsEnabled(engine.isContinuationsEnabled());
                 }
-
+                if (engine.isSendServerVersion() != null) {
+                    eng.setSendServerVersion(engine.isSendServerVersion());
+                }
                 if (engine.getHost() != null && 
!StringUtils.isEmpty(engine.getHost())) {
                     eng.setHost(engine.getHost());
                 }
diff --git 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
index 63620b6..7aa1ce1 100644
--- 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
+++ 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
@@ -137,6 +137,8 @@ public class HTTPJettyTransportActivator
                 
e.setSessionSupport(Boolean.parseBoolean((String)properties.get(k)));
             } else if ("continuationsEnabled".equals(k)) {
                 
e.setContinuationsEnabled(Boolean.parseBoolean((String)properties.get(k)));
+            } else if ("sendServerVersion".equals(k)) {
+                
e.setSendServerVersion(Boolean.parseBoolean((String)properties.get(k)));
             } else if ("reuseAddress".equals(k)) {
                 
e.setReuseAddress(Boolean.parseBoolean((String)properties.get(k)));
             } else if ("maxIdleTime".equals(k)) {