Author: ay Date: Thu Nov 21 16:43:45 2013 New Revision: 1544248 URL: http://svn.apache.org/r1544248 Log: Merged revisions 1544247 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1544247 | ay | 2013-11-21 17:37:58 +0100 (Thu, 21 Nov 2013) | 10 lines Merged revisions 1543886 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1543886 | ay | 2013-11-20 18:21:56 +0100 (Wed, 20 Nov 2013) | 2 lines simplify the boolean exp for AbstractHTTPDestniation.hasNotResponseContent ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Modified: cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1544248&r1=1544247&r2=1544248&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original) +++ cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Thu Nov 21 16:43:45 2013 @@ -602,7 +602,7 @@ public abstract class AbstractHTTPDestin // old behavior not suppressing any responses => ow && !pr // suppress empty responses for oneway calls => ow && (!pr || epr) // suppress additionally empty responses for decoupled twoway calls => - return (ow && (!pr || epr)) || (!ow && epr); + return (ow && !pr) || epr; } private HttpServletResponse getHttpResponseFromMessage(Message message) throws IOException {
