[engine] Review DataSourceResourceLoader

 - use ResultSet.getCharacterStream()
 - fix test case for database genericity



git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1799837 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 20 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 58bcf2f4..1b81070c 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
@@ -226,31 +226,14 @@ public class DataSourceResourceLoader extends ResourceLoader
 
             if (rs.next())
             {
-                InputStream rawStream = rs.getAsciiStream(templateColumn);
-                if (rawStream == null)
+                Reader reader = rs.getCharacterStream(templateColumn);
+                if (reader == null)
                 {
                     throw new ResourceNotFoundException("DataSourceResourceLoader: "
                             + "template column for '"
                             + name + "' is null");
                 }
-                try
-                {
-                    return buildReader(rawStream, encoding);
-                }
-                catch (Exception e)
-                {
-                    if (rawStream != null)
-                    {
-                        try
-                        {
-                            rawStream.close();
-                        }
-                        catch(IOException ioe) {}
-                    }
-                    String msg = "Exception while loading Template column for " + name;
-                    log.error(msg, e);
-                    throw new VelocityException(msg, e);
-                }
+                return reader;
             }
             else
             {