Author: nbubna
Date: Tue Nov 14 13:53:42 2006
New Revision: 475015
URL: http://svn.apache.org/viewvc?view=rev&rev=475015
Log:
due to problem pointed out in VELTOOLS-67, only allow path filters for
request-scoped tools
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java?view=diff&rev=475015&r1=475014&r2=475015
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
Tue Nov 14 13:53:42 2006
@@ -285,10 +285,10 @@
if (info instanceof ServletToolInfo)
{
ServletToolInfo sti = (ServletToolInfo)info;
- if (ViewContext.APPLICATION.equalsIgnoreCase(sti.getScope()) &&
- sti.getRequestPath() != null)
+ if (sti.getRequestPath() != null &&
+ !ViewContext.REQUEST.equalsIgnoreCase(sti.getScope()))
{
- LOG.error("Application-scoped tool " + sti.getKey() + " cannot
have a request path restriction!");
+ LOG.error(sti.getKey() + " must be a request-scoped tool to
have a request path restriction!");
return false;
}
}
@@ -391,10 +391,7 @@
while(i.hasNext())
{
ServletToolInfo sti = (ServletToolInfo)i.next();
- if (sti.allowsRequestPath(requestPath))
- {
- stmap.put(sti.getKey(), sti.getInstance(ctx));
- }
+ stmap.put(sti.getKey(), sti.getInstance(ctx));
}
session.setAttribute(SESSION_TOOLS_KEY, stmap);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
