You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by me...@apache.org on 2010/03/09 12:46:15 UTC
svn commit: r920814 -
/click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java
Author: medgar
Date: Tue Mar 9 11:46:14 2010
New Revision: 920814
URL: http://svn.apache.org/viewvc?rev=920814&view=rev
Log:
CLK-606
Modified:
click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java
Modified: click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java?rev=920814&r1=920813&r2=920814&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java (original)
+++ click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java Tue Mar 9 11:46:14 2010
@@ -30,6 +30,7 @@ import java.util.TreeMap;
import javax.servlet.ServletContext;
+import org.apache.click.Context;
import org.apache.click.Page;
import org.apache.click.util.ClickUtils;
@@ -552,7 +553,7 @@ public class VelocityTemplateService imp
new ErrorReport(te,
((page != null) ? page.getClass() : null),
configService.isProductionMode(),
- page.getContext().getRequest(),
+ Context.getThreadLocalContext().getRequest(),
configService.getServletContext());
@@ -578,7 +579,7 @@ public class VelocityTemplateService imp
new ErrorReport(te,
((page != null) ? page.getClass() : null),
configService.isProductionMode(),
- page.getContext().getRequest(),
+ Context.getThreadLocalContext().getRequest(),
configService.getServletContext());
@@ -602,10 +603,10 @@ public class VelocityTemplateService imp
// error report to the previous output.
ErrorReport errorReport =
new ErrorReport(te,
- ((page != null) ? page.getClass() : null),
- configService.isProductionMode(),
- page.getContext().getRequest(),
- configService.getServletContext());
+ ((page != null) ? page.getClass() : null),
+ configService.isProductionMode(),
+ Context.getThreadLocalContext().getRequest(),
+ configService.getServletContext());
if (velocityWriter == null) {
velocityWriter =
@@ -624,10 +625,10 @@ public class VelocityTemplateService imp
// error report to the previous output.
ErrorReport errorReport =
new ErrorReport(te,
- ((page != null) ? page.getClass() : null),
- configService.isProductionMode(),
- page.getContext().getRequest(),
- configService.getServletContext());
+ ((page != null) ? page.getClass() : null),
+ configService.isProductionMode(),
+ Context.getThreadLocalContext().getRequest() ,
+ configService.getServletContext());
if (velocityWriter == null) {
velocityWriter =