You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/01/11 03:19:10 UTC
svn commit: r611020 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java
test/java/org/apache/tapestry/internal/services/RequestPathOptimizerImplTest.java
Author: hlship
Date: Thu Jan 10 18:19:08 2008
New Revision: 611020
URL: http://svn.apache.org/viewvc?rev=611020&view=rev
Log:
TAPESTRY-2033: Optimized requests paths are broken for root paths within contexts
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestPathOptimizerImplTest.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java?rev=611020&r1=611019&r2=611020&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java Thu Jan 10 18:19:08 2008
@@ -52,7 +52,6 @@
builder.append(_request.getContextPath());
-
builder.append(requestPath);
String requestURI = builder.toString();
@@ -61,7 +60,7 @@
// Degenerate case when getting the root application
- if (requestPath.equals("")) requestTerms = add(requestTerms, "");
+ if (requestPath.equals("/") || requestPath.equals("")) requestTerms = add(requestTerms, "");
String[] pathTerms = SLASH_PATTERN.split(path);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestPathOptimizerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestPathOptimizerImplTest.java?rev=611020&r1=611019&r2=611020&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestPathOptimizerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestPathOptimizerImplTest.java Thu Jan 10 18:19:08 2008
@@ -53,6 +53,11 @@
{"", "", "/asset/foo.gif", "asset/foo.gif"},
+ {"/example", "/", "/example/assets/tapestry/default.css", "assets/tapestry/default.css"},
+
+ {"/example", "/newaccount", "/example/assets/tapestry/default.css",
+ "assets/tapestry/default.css"},
+
{"/verylongcontextname", "/style/app.css", "/verylongcontextname/asset/foo.gif",
"../asset/foo.gif"},