Repository: cxf Updated Branches: refs/heads/master a61b4b82b -> c8b3fb2fb
CXF-7378 fix checkstyle issues Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c8b3fb2f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c8b3fb2f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c8b3fb2f Branch: refs/heads/master Commit: c8b3fb2fbdd8ed82dd20ca757a8e9f4bdf1cc76a Parents: a61b4b8 Author: Jason Pell <[email protected]> Authored: Sat May 20 11:44:05 2017 +1000 Committer: Jason Pell <[email protected]> Committed: Sat May 20 11:44:05 2017 +1000 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/transport/http/HTTPConduit.java | 2 +- .../apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c8b3fb2f/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java index 48c48dc..a6585ff 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java @@ -1627,7 +1627,7 @@ public abstract class HTTPConduit updateResponseHeaders(inMessage); inMessage.put(Message.RESPONSE_CODE, responseCode); if (MessageUtils.getContextualBoolean(outMessage, SET_HTTP_RESPONSE_MESSAGE, false)) { - inMessage.put(HTTP_RESPONSE_MESSAGE, getResponseMessage()); + inMessage.put(HTTP_RESPONSE_MESSAGE, getResponseMessage()); } propagateConduit(exchange, inMessage); http://git-wip-us.apache.org/repos/asf/cxf/blob/c8b3fb2f/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java index dae7a58..94b628f 100644 --- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java +++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java @@ -552,8 +552,8 @@ public class HTTPConduitURLEasyMockTest extends Assert { connection.getHeaderFields(); EasyMock.expectLastCall().andReturn(Collections.EMPTY_MAP).anyTimes(); - connection.getResponseMessage(); - EasyMock.expectLastCall().andReturn(HTTP_RESPONSE_MESSAGE).anyTimes(); + connection.getResponseMessage(); + EasyMock.expectLastCall().andReturn(HTTP_RESPONSE_MESSAGE).anyTimes(); int responseCode = getResponseCode(style); if (conduit.getClient().isAutoRedirect()) {
