root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

set shared variables with configured ObjectWrapper (SPR-7165) 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3315 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller 2010-05-07 15:06:27 +00:00
parent 4e32e896ab
commit 0ce8c6bf9d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.context.support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -286,7 +286,7 @@ public class FreeMarkerConfigurationFactory {
} }
if (!CollectionUtils.isEmpty(this.freemarkerVariables)) { if (!CollectionUtils.isEmpty(this.freemarkerVariables)) {
config.setAllSharedVariables(new SimpleHash(this.freemarkerVariables)); config.setAllSharedVariables(new SimpleHash(this.freemarkerVariables, config.getObjectWrapper()));
} }
if (this.defaultEncoding != null) { if (this.defaultEncoding != null) {