[HippoCMS-svn] [45311] hippo-cms7/site-toolkit: HSTTWO-2977 remove mount argument as only used with value null

[aschrijvers]

Revision: 45311
Author:   aschrijvers
Date:     2014-06-25 15:05:24 +0200 (Wed, 25 Jun 2014)
Log Message:
-----------
HSTTWO-2977 remove mount argument as only used with value null

Modified Paths:
--------------
    
hippo-cms7/site-toolkit/trunk/commons/src/main/java/org/hippoecm/hst/util/HstRequestUtils.java

Modified: 
hippo-cms7/site-toolkit/trunk/commons/src/main/java/org/hippoecm/hst/util/HstRequestUtils.java
===================================================================
--- 
hippo-cms7/site-toolkit/trunk/commons/src/main/java/org/hippoecm/hst/util/HstRequestUtils.java
      2014-06-25 12:38:19 UTC (rev 45310)
+++ 
hippo-cms7/site-toolkit/trunk/commons/src/main/java/org/hippoecm/hst/util/HstRequestUtils.java
      2014-06-25 13:05:24 UTC (rev 45311)
@@ -108,7 +108,7 @@
      * @return the decoded getRequestURI after the context path but before the 
matrix parameters or the query string in the request URL
      */
     public static String getRequestPath(HttpServletRequest request) {
-        return getDecodedPath(null, request, null);
+        return getDecodedPath(request, null);
     }
 
     /**
@@ -117,21 +117,13 @@
      * @return the decoded getRequestURI after the context path but before the 
matrix parameters or the query string in the request URL
      */
     public static String getRequestPath(HttpServletRequest request, String 
characterEncoding) {
-        return getDecodedPath(null, request, characterEncoding);
+        return getDecodedPath(request, characterEncoding);
     }
 
-    private static String getDecodedPath(ResolvedMount mount, 
HttpServletRequest request, String characterEncoding) {
+    private static String getDecodedPath(HttpServletRequest request, String 
characterEncoding) {
         String requestURI = getRequestURI(request, true);
         String encodePathInfo = 
requestURI.substring(request.getContextPath().length());
 
-        if (mount != null) {
-            String ignoredPrefix = mount.getMatchingIgnoredPrefix();
-            if (ignoredPrefix != null) {
-                encodePathInfo = 
encodePathInfo.substring(ignoredPrefix.length() + 1);
-            }
-            encodePathInfo = 
encodePathInfo.substring(mount.getResolvedMountPath().length());
-        }
-
         if (characterEncoding == null) {
             characterEncoding = request.getCharacterEncoding();
 

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn