diff options
author | Claude Brisson <cbrisson@apache.org> | 2017-06-27 07:40:57 +0000 |
---|---|---|
committer | Claude Brisson <cbrisson@apache.org> | 2017-06-27 07:40:57 +0000 |
commit | 0f7c41866c91064b6e193a593e242b0c0359e55f (patch) | |
tree | 70c73952db887b55de8cba8e7c85fc45cff40efe /velocity-engine-core/src/main/java | |
parent | 67863737c3ee80e5b40e2147177539fa8934f83d (diff) | |
download | apache-velocity-engine-0f7c41866c91064b6e193a593e242b0c0359e55f.tar.gz |
[engine] DataSourceResourceLoader: pass input encoding to the getReader() method
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1800026 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'velocity-engine-core/src/main/java')
-rw-r--r-- | velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java index 78ba6015..c919bc07 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java @@ -262,7 +262,7 @@ public class DataSourceResourceLoader extends ResourceLoader 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 extends ResourceLoader /** * 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); |