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 3946D11C93 for ; Tue, 23 Sep 2014 12:30:44 +0000 (UTC) Received: (qmail 63416 invoked by uid 500); 23 Sep 2014 12:30:44 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 63360 invoked by uid 500); 23 Sep 2014 12:30:44 -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 63350 invoked by uid 99); 23 Sep 2014 12:30:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Sep 2014 12:30:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B22AE936B44; Tue, 23 Sep 2014 12:30:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ashakirin@apache.org To: commits@cxf.apache.org Message-Id: <2f1cea4f310b442a8038469e15455250@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [CXF-6020]: UrilInfo.getAbsolutePath() missing path separator between servlet url and relative url Date: Tue, 23 Sep 2014 12:30:41 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 52d650add -> f5a4c4826 [CXF-6020]: UrilInfo.getAbsolutePath() missing path separator between servlet url and relative url Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f5a4c482 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f5a4c482 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f5a4c482 Branch: refs/heads/2.7.x-fixes Commit: f5a4c4826dc52690c75d3c8a73a1959644d240ae Parents: 52d650a Author: Andrei Shakirin Authored: Tue Sep 23 14:20:56 2014 +0200 Committer: Andrei Shakirin Committed: Tue Sep 23 14:27:44 2014 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java | 3 +++ .../test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java | 5 +++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f5a4c482/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java index a3cdaf8..01b48cd 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java @@ -212,6 +212,9 @@ public class UriInfoImpl implements UriInfo { if (path.startsWith("/") && address.endsWith("/")) { address = address.substring(0, address.length() - 1); } + if (!path.isEmpty() && !path.startsWith("/") && !address.endsWith("/")) { + address = address + "/"; + } return address + path; } } http://git-wip-us.apache.org/repos/asf/cxf/blob/f5a4c482/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java index 4b74c43..6674e70 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java @@ -56,11 +56,16 @@ public class UriInfoImplTest extends Assert { null); assertEquals("Wrong absolute path", "http://localhost:8080/baz/bar", u.getAbsolutePath().toString()); + u = new UriInfoImpl(mockMessage("http://localhost:8080/baz/", "/bar"), null); assertEquals("Wrong absolute path", "http://localhost:8080/baz/bar", u.getAbsolutePath().toString()); + u = new UriInfoImpl(mockMessage("http://localhost:8080/baz", "bar"), + null); + assertEquals("Wrong absolute path", "http://localhost:8080/baz/bar", + u.getAbsolutePath().toString()); } @Test