LOB storage: LOBs added with "h2.lobInDatabase" enabled couldn't be read later…

LOB storage: LOBs added with "h2.lobInDatabase" enabled couldn't be read later with this option disabled.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>-
+<ul><li>JdbcConnectionPool: the default connection timeout is now 30 seconds (it used to be 5 minutes).
+</li><li>LOB storage: LOBs added with "h2.lobInDatabase" enabled couldn't
+    be read later with this option disabled.
 </li></ul>
 
 <h2>Next Version (unreleased)</h2>

h2/src/main/org/h2/engine/Database.java

@@ -595,7 +595,9 @@ public class Database implements DataHandler {
         addDefaultSetting(systemSession, SetTypes.CLUSTER, Constants.CLUSTERING_DISABLED, 0);
         addDefaultSetting(systemSession, SetTypes.WRITE_DELAY, null, Constants.DEFAULT_WRITE_DELAY);
         addDefaultSetting(systemSession, SetTypes.CREATE_BUILD, null, Constants.BUILD_ID);
-        getLobStorage().init();
+        if (SysProperties.LOB_IN_DATABASE) {
+            getLobStorage().init();
+        }
         systemSession.commit(true);
         traceSystem.getTrace(Trace.DATABASE).info("opened " + databaseName);
         afterWriting();
@@ -2251,13 +2253,10 @@ public class Database implements DataHandler {
     }
 
     public Connection getLobConnection() {
-        if (SysProperties.LOB_IN_DATABASE) {
-            String url = Constants.CONN_URL_INTERNAL;
-            JdbcConnection conn = new JdbcConnection(systemSession, systemUser.getName(), url);
-            conn.setTraceLevel(TraceSystem.OFF);
-            return conn;
-        }
-        return null;
+        String url = Constants.CONN_URL_INTERNAL;
+        JdbcConnection conn = new JdbcConnection(systemSession, systemUser.getName(), url);
+        conn.setTraceLevel(TraceSystem.OFF);
+        return conn;
     }
 
 }