MVStore: move background exception listener to the builder

h2/src/main/org/h2/mvstore/db/MVTableEngine.java

@@ -6,6 +6,7 @@
  */
 package org.h2.mvstore.db;
 
+import java.beans.ExceptionListener;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -38,9 +39,11 @@ public class MVTableEngine implements TableEngine {
      * @param db the database
      * @return the store
      */
-    public static Store init(Database db) {
+    public static Store init(final Database db) {
         Store store = db.getMvStore();
-        if (store == null) {
+        if (store != null) {
+            return store;
+        }
         byte[] key = db.getFilePasswordHash();
         String dbPath = db.getDatabasePath();
         MVStore.Builder builder = new MVStore.Builder();
@@ -68,6 +71,14 @@ public class MVTableEngine implements TableEngine {
                 }
                 builder.encryptionKey(password);
             }
+            builder.backgroundExceptionListener(new ExceptionListener() {
+
+                @Override
+                public void exceptionThrown(Exception e) {
+                    db.setBackgroundException(DbException.convert(e));
+                }
+
+            });
             try {
                 store = new Store(db, builder.open());
             } catch (IllegalStateException e) {
@@ -83,7 +94,6 @@ public class MVTableEngine implements TableEngine {
             }
         }
         db.setMvStore(store);
-        }
         return store;
     }