Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/09f8068a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/09f8068a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/09f8068a Branch: refs/heads/master Commit: 09f8068a10a570e409e4b04014758a4a5bfb0371 Parents: 3ebbda1 8a32190 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Feb 19 17:54:49 2014 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Feb 19 17:54:49 2014 +0000 ---------------------------------------------------------------------- .../cxf/interceptor/StaxInInterceptor.java | 19 +++++++++++++++---- .../jaxrs/provider/json/JSONProviderTest.java | 2 +- .../oauth/filters/AbstractAuthFilter.java | 20 ++++++++++++++++++-- 3 files changed, 34 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
