Buffered and unbuffered readers

h2/src/main/org/h2/message/TraceObject.java

@@ -388,7 +388,7 @@ public class TraceObject {
             synchronized (TraceObject.class) {
                 // e.printStackTrace();
                 try {
-                    Writer writer = IOUtils.getWriter(IOUtils.openFileOutputStream(SysProperties.LOG_ALL_ERRORS_FILE, true));
+                    Writer writer = IOUtils.getBufferedWriter(IOUtils.openFileOutputStream(SysProperties.LOG_ALL_ERRORS_FILE, true));
                     PrintWriter p = new PrintWriter(writer);
                     e.printStackTrace(p);
                     p.close();

h2/src/main/org/h2/message/TraceSystem.java

@@ -282,7 +282,7 @@ public class TraceSystem implements TraceWriter {
                     // can't be opened
                     return false;
                 }
-                fileWriter = IOUtils.getWriter(IOUtils.openFileOutputStream(fileName, true));
+                fileWriter = IOUtils.getBufferedWriter(IOUtils.openFileOutputStream(fileName, true));
                 printWriter = new PrintWriter(fileWriter, true);
             } catch (Exception e) {
                 logWritingError(e);

h2/src/main/org/h2/tools/ConvertTraceFile.java

@@ -110,9 +110,9 @@ public class ConvertTraceFile extends Tool {
      * @throws IOException
      */
     private void convertFile(String traceFileName, String javaClassName, String script) throws IOException {
-        LineNumberReader reader = new LineNumberReader(IOUtils.getReader(IOUtils.openFileInputStream(traceFileName)));
-        PrintWriter javaWriter = new PrintWriter(IOUtils.getWriter(IOUtils.openFileOutputStream(javaClassName + ".java", false)));
-        PrintWriter scriptWriter = new PrintWriter(IOUtils.getWriter(IOUtils.openFileOutputStream(script, false)));
+        LineNumberReader reader = new LineNumberReader(IOUtils.getBufferedReader(IOUtils.openFileInputStream(traceFileName)));
+        PrintWriter javaWriter = new PrintWriter(IOUtils.getBufferedWriter(IOUtils.openFileOutputStream(javaClassName + ".java", false)));
+        PrintWriter scriptWriter = new PrintWriter(IOUtils.getBufferedWriter(IOUtils.openFileOutputStream(script, false)));
         javaWriter.println("import java.io.*;");
         javaWriter.println("import java.sql.*;");
         javaWriter.println("import java.math.*;");

h2/src/main/org/h2/tools/Recover.java

@@ -246,7 +246,7 @@ public class Recover extends Tool implements DataHandler {
         fileName = fileName.substring(0, fileName.length() - 3);
         String outputFile = fileName + suffix;
         trace("Created file: " + outputFile);
-        return new PrintWriter(IOUtils.getWriter(IOUtils.openFileOutputStream(outputFile, false)));
+        return new PrintWriter(IOUtils.getBufferedWriter(IOUtils.openFileOutputStream(outputFile, false)));
     }
 
     private void writeDataError(PrintWriter writer, String error, byte[] data) {

h2/src/main/org/h2/tools/Script.java

@@ -188,7 +188,7 @@ public class Script extends Tool {
         Statement stat = null;
         try {
             stat = conn.createStatement();
-            PrintWriter writer = new PrintWriter(IOUtils.getWriter(o));
+            PrintWriter writer = new PrintWriter(IOUtils.getBufferedWriter(o));
             ResultSet rs = stat.executeQuery("SCRIPT");
             while (rs.next()) {
                 String s = rs.getString(1);

h2/src/main/org/h2/util/IOUtils.java

@@ -338,9 +338,30 @@ public class IOUtils {
         return off <= 0 ? -1 : off;
     }
 
+    /**
+     * Create a buffered reader to read from an input stream using the UTF-8
+     * format. If the input stream is null, this method returns null. The
+     * InputStreamReader that is used here is not exact, that means it may read
+     * some additional bytes when buffering.
+     *
+     * @param in the input stream or null
+     * @return the reader
+     */
+    public static Reader getBufferedReader(InputStream in) {
+        try {
+            //
+            return in == null ? null : new BufferedReader(new InputStreamReader(in, Constants.UTF8));
+        } catch (Exception e) {
+            // UnsupportedEncodingException
+            throw DbException.convert(e);
+        }
+    }
+
     /**
      * Create a reader to read from an input stream using the UTF-8 format. If
-     * the input stream is null, this method returns null.
+     * the input stream is null, this method returns null. The InputStreamReader
+     * that is used here is not exact, that means it may read some additional
+     * bytes when buffering.
      *
      * @param in the input stream or null
      * @return the reader
@@ -362,7 +383,7 @@ public class IOUtils {
      * @param out the output stream or null
      * @return the writer
      */
-    public static Writer getWriter(OutputStream out) {
+    public static Writer getBufferedWriter(OutputStream out) {
         try {
             return out == null ? null : new BufferedWriter(new OutputStreamWriter(out, Constants.UTF8));
         } catch (Exception e) {

h2/src/main/org/h2/util/SourceCompiler.java

@@ -148,7 +148,7 @@ public class SourceCompiler {
         File classFile = new File(dir, className + ".class");
         try {
             OutputStream f = IOUtils.openFileOutputStream(javaFile.getAbsolutePath(), false);
-            PrintWriter out = new PrintWriter(IOUtils.getWriter(f));
+            PrintWriter out = new PrintWriter(IOUtils.getBufferedWriter(f));
             classFile.delete();
             int endImport = source.indexOf("@CODE");
             String importCode = "import java.util.*;\n" +

h2/src/main/org/h2/value/ValueLobDb.java

@@ -261,7 +261,7 @@ public class ValueLobDb extends Value implements Value.ValueClob, Value.ValueBlo
     }
 
     public Reader getReader() {
-        return IOUtils.getReader(getInputStream());
+        return IOUtils.getBufferedReader(getInputStream());
     }
 
     public InputStream getInputStream() {

h2/src/test/org/h2/test/TestAll.java

@@ -587,6 +587,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
         new TestCancel().runTest(this);
         new TestDatabaseEventListener().runTest(this);
         new TestDriver().runTest(this);
+        new TestLob().runTest(this);
         new TestManyJdbcObjects().runTest(this);
         new TestMetaData().runTest(this);
         new TestNativeSQL().runTest(this);

h2/src/test/org/h2/test/unit/TestReader.java

@@ -35,7 +35,7 @@ public class TestReader extends TestBase {
         InputStream in = new ReaderInputStream(r);
         byte[] buff = IOUtils.readBytesAndClose(in, 0);
         InputStream in2 = new ByteArrayInputStream(buff);
-        Reader r2 = IOUtils.getReader(in2);
+        Reader r2 = IOUtils.getBufferedReader(in2);
         String s2 = IOUtils.readStringAndClose(r2, Integer.MAX_VALUE);
         assertEquals(s, s2);
     }