Author: apetrelli
Date: Sun Feb 8 23:03:53 2009
New Revision: 742198
URL: http://svn.apache.org/viewvc?rev=742198&view=rev
Log:
TILESSB-4
Fixed object wrapping.
Modified:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
Modified:
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java?rev=742198&r1=742197&r2=742198&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
(original)
+++
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
Sun Feb 8 23:03:53 2009
@@ -14,8 +14,6 @@
import org.apache.tiles.servlet.context.ServletUtil;
import freemarker.core.Environment;
-import freemarker.ext.beans.BeanModel;
-import freemarker.ext.beans.BeansWrapper;
import freemarker.ext.servlet.FreemarkerServlet;
import freemarker.ext.servlet.HttpRequestHashModel;
import freemarker.ext.servlet.ServletContextHashModel;
@@ -172,9 +170,13 @@
scope = "page";
}
if ("page".equals(scope)) {
- TemplateModel model = new BeanModel(obj, BeansWrapper
- .getDefaultInstance());
- env.setVariable(name, model);
+ try {
+ TemplateModel model = env.getObjectWrapper().wrap(obj);
+ env.setVariable(name, model);
+ } catch (TemplateModelException e) {
+ throw new FreeMarkerTilesException(
+ "Error when wrapping an object", e);
+ }
} else if ("request".equals(scope)) {
getRequestHashModel(env).getRequest().setAttribute(name, obj);
} else if ("session".equals(scope)) {
