Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 51FC1200C89 for ; Sat, 20 May 2017 03:44:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5036D160BD2; Sat, 20 May 2017 01:44:14 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 95499160BD1 for ; Sat, 20 May 2017 03:44:13 +0200 (CEST) Received: (qmail 31623 invoked by uid 500); 20 May 2017 01:44:12 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 31611 invoked by uid 99); 20 May 2017 01:44:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 May 2017 01:44:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0FF24DFE34; Sat, 20 May 2017 01:44:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jpell@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: CXF-7378 fix checkstyle issues Date: Sat, 20 May 2017 01:44:11 +0000 (UTC) archived-at: Sat, 20 May 2017 01:44:14 -0000 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 Authored: Sat May 20 11:44:05 2017 +1000 Committer: Jason Pell 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()) {