svn commit: r1383915 - /rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerContextImpl.java

[ate]

Author: ate
Date: Wed Sep 12 12:32:16 2012
New Revision: 1383915

URL: http://svn.apache.org/viewvc?rev=1383915&view=rev
Log:
RAVE-694: small fix for RoutePathMapping taking servletPath prefixing into 
account

Modified:
    
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerContextImpl.java

Modified: 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerContextImpl.java
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerContextImpl.java?rev=1383915&r1=1383914&r2=1383915&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerContextImpl.java
 (original)
+++ 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerContextImpl.java
 Wed Sep 12 12:32:16 2012
@@ -27,7 +27,6 @@ public class HandlerContextImpl implemen
 
     private HandlerConfig config;
     private Map<String, Map<String, String>> targetActionPathMap;
-    private boolean alwaysUseFullPath;
     private String servletPath;
 
     private UrlPathHelper urlPathHelper;
@@ -35,7 +34,6 @@ public class HandlerContextImpl implemen
 
     public HandlerContextImpl(UrlPathHelper urlPathHelper, boolean 
alwaysUseFullPath, Map<String, Map<String, String>> targetActionPathMap, 
HttpServletRequest request) {
         this.urlPathHelper = urlPathHelper;
-        this.alwaysUseFullPath = alwaysUseFullPath;
         this.targetActionPathMap = targetActionPathMap;
         this.request = request;
         if (!alwaysUseFullPath) {
@@ -69,7 +67,7 @@ public class HandlerContextImpl implemen
             String path = actionMap.get(routeAction);
             if (path != null) {
                 UriComponentsBuilder builder = null;
-                if (alwaysUseFullPath) {
+                if (servletPath != null) {
                     builder = UriComponentsBuilder.fromPath(servletPath);
                     builder = builder.path(path);
                 }