You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2003/09/26 18:53:28 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/velocity TurbineVelocityService.java
epugh 2003/09/26 09:53:28
Modified: src/java/org/apache/turbine/services/velocity
TurbineVelocityService.java
Log:
Removed a deprecated method call to velocity.
Revision Changes Path
1.28 +4 -6 jakarta-turbine-2/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- TurbineVelocityService.java 15 Jul 2003 12:07:06 -0000 1.27
+++ TurbineVelocityService.java 26 Sep 2003 16:53:28 -0000 1.28
@@ -113,6 +113,7 @@
* @author <a href="mailto:sean@informage.ent">Sean Legassick</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
+ * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
public class TurbineVelocityService
@@ -448,12 +449,9 @@
if (encoding != null)
{
- Velocity.mergeTemplate(filename, encoding, context, writer);
- }
- else
- {
- Velocity.mergeTemplate(filename, context, writer);
+ encoding = DEFAULT_CHAR_SET;
}
+ Velocity.mergeTemplate(filename, encoding, context, writer);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org