svn commit: r1373662 - /karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java

[ldywicki]

Author: ldywicki
Date: Wed Aug 15 22:36:48 2012
New Revision: 1373662

URL: http://svn.apache.org/viewvc?rev=1373662&view=rev
Log:
KARAF-1731 Active trail detection is broken after upgrade to wicket 1.5

Modified:
    
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java?rev=1373662&r1=1373661&r2=1373662&view=diff
==============================================================================
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java
 Wed Aug 15 22:36:48 2012
@@ -20,6 +20,7 @@ import org.apache.wicket.Page;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.protocol.http.RequestUtils;
 import org.apache.wicket.request.cycle.RequestCycle;
 
 /**
@@ -54,13 +55,13 @@ public abstract class LinkUtils {
      */
     public static boolean isActiveTrail(Link<?> link) {
         if (link instanceof BookmarkablePageLink) {
+            RequestCycle requestCycle = RequestCycle.get();
+            String requestPath = requestCycle.getRequest().getUrl().toString();
             Class<? extends Page> pageClass = ((BookmarkablePageLink<?>) 
link).getPageClass();
 
-            RequestCycle requestCycle = RequestCycle.get();
-            String linkPath = (requestCycle.urlFor(pageClass, null) + 
"").replace("../", "");
+            String linkPath = requestCycle.urlFor(pageClass, null).toString();
 
-            String requestPath = requestCycle.getRequest().getUrl().toString();
-            return requestPath.contains(linkPath);
+            return 
requestPath.contains(RequestUtils.toAbsolutePath(requestPath, linkPath));
         }
         return false;
     }