From 44b747ad3b23d021b7f6beb322c11eb064a5ef53 Mon Sep 17 00:00:00 2001 From: Felix Rabe Date: Wed, 27 Oct 2010 14:08:00 +0200 Subject: [PATCH] Make info.magnolia.link.CompleteUrlPathTransformer.prefixLink(String) slash-safe --- .../magnolia/link/CompleteUrlPathTransformer.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/info/magnolia/link/CompleteUrlPathTransformer.java b/src/main/java/info/magnolia/link/CompleteUrlPathTransformer.java index 96eb8d6..2db53e7 100644 --- a/src/main/java/info/magnolia/link/CompleteUrlPathTransformer.java +++ b/src/main/java/info/magnolia/link/CompleteUrlPathTransformer.java @@ -50,10 +50,9 @@ public class CompleteUrlPathTransformer extends AbsolutePathTransformer { } protected String prefixLink(String linkStr) { - final String base = ServerConfiguration.getInstance().getDefaultBaseUrl(); - if (base.endsWith("/") && linkStr.startsWith("/")) { - return base + linkStr.substring(1); - } + String base = ServerConfiguration.getInstance().getDefaultBaseUrl(); + if (!base.endsWith("/")) base += "/"; + if (linkStr.startsWith("/")) linkStr = linkStr.substring(1); return base + linkStr; } } -- 1.7.2.3