svn commit: r1800026 - /velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java

[cbrisson]

Author: cbrisson
Date: Tue Jun 27 07:40:57 2017
New Revision: 1800026

URL: http://svn.apache.org/viewvc?rev=1800026&view=rev
Log:
[engine] DataSourceResourceLoader: pass input encoding to the getReader() method

Modified:
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?rev=1800026&r1=1800025&r2=1800026&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
 Tue Jun 27 07:40:57 2017
@@ -262,7 +262,7 @@ public class DataSourceResourceLoader ex
 
             if (rs.next())
             {
-                Reader reader = getReader(rs, templateColumn);
+                Reader reader = getReader(rs, templateColumn, encoding);
                 if (reader == null)
                 {
                     throw new 
ResourceNotFoundException("DataSourceResourceLoader: "
@@ -529,7 +529,7 @@ public class DataSourceResourceLoader ex
     /**
      * Gets a reader from a result set's column
      */
-    protected Reader getReader(ResultSet resultSet, String column)
+    protected Reader getReader(ResultSet resultSet, String column, String 
encoding)
         throws SQLException
     {
         return resultSet.getCharacterStream(column);