You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2016/11/08 07:56:45 UTC

[5/7] cxf git commit: Merge branch 'master' of https://github.com/apache/cxf into fix-AsyncHTTPConduit-timeout

Merge branch 'master' of https://github.com/apache/cxf into fix-AsyncHTTPConduit-timeout


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/44a697f2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/44a697f2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/44a697f2

Branch: refs/heads/master
Commit: 44a697f2cc343a65809e1f1e253a37d747698909
Parents: 4c6a9aa 9e1ba10
Author: William Montaz <wm...@voyages-sncf.com>
Authored: Mon Nov 7 11:04:57 2016 +0100
Committer: William Montaz <wm...@voyages-sncf.com>
Committed: Mon Nov 7 11:04:57 2016 +0100

----------------------------------------------------------------------
 .../apache/cxf/common/util/PackageUtils.java    | 30 ++++++++--------
 .../cxf/common/util/PackageUtilsTest.java       | 16 +++++++++
 .../apache/cxf/ext/logging/osgi/Activator.java  | 37 ++++++++++++--------
 .../cxf/jaxrs/impl/AsyncResponseImpl.java       |  2 +-
 .../apache/cxf/jaxrs/utils/ResourceUtils.java   | 19 +++++-----
 .../http/asyncclient/SharedOutputBuffer.java    |  1 +
 .../transport/http_jetty/JettyHTTPHandler.java  | 19 ++++++----
 .../apache/cxf/transport/http/HTTPConduit.java  |  1 +
 .../jaxrs/JAXRSClientServerBookTest.java        |  8 +++++
 9 files changed, 89 insertions(+), 44 deletions(-)
----------------------------------------------------------------------