Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Date: Tue, 17 Oct 2017 03:49:42 +0000
To: "commits@cxf.apache.org" <commits@cxf.apache.org>
Subject: [cxf] branch 3.1.x-fixes updated: [CXF-7531]add async-supported
 init parameter configuration for the cxf-osgi-transport-servlet
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Message-ID: <150821218241.23644.15685986282418149514@gitbox.apache.org>
From: ffang@apache.org
Auto-Submitted: auto-generated
archived-at: Tue, 17 Oct 2017 03:49:49 -0000

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

ffang pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
     new e026e25  [CXF-7531]add async-supported init parameter configuration for the cxf-osgi-transport-servlet
e026e25 is described below

commit e026e25c5a83550f51a44df5cff3cd7cbdbbfaf6
Author: Freeman Fang <freeman.fang@gmail.com>
AuthorDate: Tue Oct 17 11:46:40 2017 +0800

    [CXF-7531]add async-supported init parameter configuration for the cxf-osgi-transport-servlet
    
    (cherry picked from commit 1cee603ce2c11509a6020ff77e96adae5cb256f0)
    
    Conflicts:
    	rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/ServletExporter.java
---
 .../java/org/apache/cxf/transport/http/osgi/ServletExporter.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/ServletExporter.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/ServletExporter.java
index 25c03e3..22b02ae 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/ServletExporter.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/ServletExporter.java
@@ -101,7 +101,9 @@ class ServletExporter implements ManagedService {
                    getProp(properties, CXF_SERVLET_PREFIX + "service-list-page-authenticate-realm", "karaf"));
         sprops.put("use-x-forwarded-headers", 
                    getProp(properties, CXF_SERVLET_PREFIX + "use-x-forwarded-headers", "false"));
-        
+        sprops.put("async-supported", 
+                   getProp(properties, CXF_SERVLET_PREFIX + "async-supported", "true"));
+
         // Accept extra properties by default, can be disabled if it is really needed
         if (Boolean.valueOf(getProp(properties, CXF_SERVLET_PREFIX + "support.extra.properties", "true").toString())) {
             Enumeration keys = properties.keys();
@@ -132,5 +134,4 @@ class ServletExporter implements ManagedService {
         Object value = properties.get(key);
         return value == null ? defaultValue : value;
     }
-    
-}
\ No newline at end of file
+}

-- 
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <commits@cxf.apache.org>'].