Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8BC42176C7 for ; Tue, 19 May 2015 22:14:17 +0000 (UTC) Received: (qmail 60073 invoked by uid 500); 19 May 2015 22:14:17 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 60009 invoked by uid 500); 19 May 2015 22:14:17 -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 60000 invoked by uid 99); 19 May 2015 22:14:17 -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; Tue, 19 May 2015 22:14:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5505BE35A4; Tue, 19 May 2015 22:14:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: asoldano@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-6404][CXF-6415] fix bug Date: Tue, 19 May 2015 22:14:17 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master dd1b3ebf5 -> 79f9a1056 [CXF-6404][CXF-6415] fix bug Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/79f9a105 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/79f9a105 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/79f9a105 Branch: refs/heads/master Commit: 79f9a1056d979b138041ef0693052d3f989ef522 Parents: dd1b3eb Author: Alessio Soldano Authored: Wed May 20 00:13:30 2015 +0200 Committer: Alessio Soldano Committed: Wed May 20 00:13:30 2015 +0200 ---------------------------------------------------------------------- .../org/apache/cxf/transport/http/HTTPConduit.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/79f9a105/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 20c4aa2..96f0377 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 @@ -727,13 +727,14 @@ public abstract class HTTPConduit if (defaultAddress == null) { if (fromEndpointReferenceType && getTarget().getAddress().getValue() != null) { defaultAddress = new Address(this.getTarget().getAddress().getValue()); + } else { + if (endpointInfo.getAddress() == null) { + throw new URISyntaxException("", + "Invalid address. Endpoint address cannot be null.", + 0); + } + defaultAddress = new Address(endpointInfo.getAddress()); } - if (endpointInfo.getAddress() == null) { - throw new URISyntaxException("", - "Invalid address. Endpoint address cannot be null.", - 0); - } - defaultAddress = new Address(endpointInfo.getAddress()); } } }