svn commit: r1752790 - /velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java

[cbrisson]

Author: cbrisson
Date: Fri Jul 15 07:47:16 2016
New Revision: 1752790

URL: http://svn.apache.org/viewvc?rev=1752790&view=rev
Log:
fix Template default encoding initialization problem (fixes VELOCITY-809)

Modified:
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java?rev=1752790&r1=1752789&r2=1752790&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
 Fri Jul 15 07:47:16 2016
@@ -1548,7 +1548,7 @@ public class RuntimeInstance implements
     public Template getTemplate(String name)
         throws ResourceNotFoundException, ParseErrorException
     {
-        return getTemplate(name, getDefaultEncoding());
+        return getTemplate(name, null);
     }
 
     /**
@@ -1566,7 +1566,7 @@ public class RuntimeInstance implements
         throws ResourceNotFoundException, ParseErrorException
     {
         requireInitialization();
-
+        if (encoding == null) encoding = getDefaultEncoding();
         return (Template)
                 resourceManager.getResource(name,
                     ResourceManager.RESOURCE_TEMPLATE, encoding);