Merge pull request #722 from katzyn/misc

Assorted minor changes

h2/src/main/org/h2/jdbc/JdbcResultSet.java

@@ -3810,10 +3810,10 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
             int id = getNextId(TraceObject.ARRAY);
             return type.cast(value == ValueNull.INSTANCE ? null : new JdbcArray(conn, value, id));
         } else if (type == Blob.class) {
-            int id = getNextId(TraceObject.ARRAY);
+            int id = getNextId(TraceObject.BLOB);
             return type.cast(value == ValueNull.INSTANCE ? null : new JdbcBlob(conn, value, id));
         } else if (type == Clob.class) {
-            int id = getNextId(TraceObject.ARRAY);
+            int id = getNextId(TraceObject.CLOB);
             return type.cast(value == ValueNull.INSTANCE ? null : new JdbcClob(conn, value, id));
         } else if (type == TimestampWithTimeZone.class) {
             return type.cast(value.getObject());

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

@@ -271,7 +271,6 @@ public class IOUtils {
     public static void closeSilently(Writer writer) {
         if (writer != null) {
             try {
-                writer.flush();
                 writer.close();
             } catch (Exception e) {
                 // ignore