Merge pull request #1650 from h2database/race-close

Fix race in MVStore.close()

h2/src/main/org/h2/mvstore/MVMap.java

@@ -138,11 +138,6 @@ public class MVMap<K, V> extends AbstractMap<K, V>
         return "map." + Integer.toHexString(mapId);
     }
 
-    /**
-     * Initialize this map.
-     */
-    protected void init() {}
-
     /**
      * Add or replace a key-value pair.
      *

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -77,7 +77,7 @@ called caller calling calls cally caload came camel can cancel canceled cancelin
 cancellation cancelled cancels candidates cannot canonical cap capabilities
 capability capacity capitalization capitalize capitalized capone caps capture
 captured car card cardinal cardinality care careful carriage carrier cars cartesian
-cascade cascading case cases casesensitive casewhen cash casing casqueiro cast
+cas cascade cascading case cases casesensitive casewhen cash casing casqueiro cast
 casting castore cat catalina catalog catalogs cataloguing catch catcher catches
 catching category catlog caucho caught cause caused causes causing cavestro
 cayenne cbc cbtree ccedil cdata cdd cddl cdo cdup cease cedil ceil ceiling cell
@@ -251,7 +251,7 @@ filo filter filtered filtering filters fin final finalization finalize finalizer
 finally find finder finding finds fine finer finish finished finishes finland fire
 firebird firebirdsql fired firefox firewall first firstname fish fit fitness fits
 fitting five fix fixed fixes fixing fkcolumn fktable flag flags flash flashback
-flat fle fletcher flexibility flexible flexive flip flipped fload float floating
+flat flavour fle fletcher flexibility flexible flexive flip flipped fload float floating
 flooding floor florent flow flower flows fluent fluid flush flushed flushes
 flushing flux fly flyway fmb fmc fml fmrn fmt fmul fmxx fmxxx fneg focus focusable
 fog fogh folder follow followed following follows font fontes foo footer footers
@@ -321,7 +321,7 @@ inform information informational informed informix informs informtn infos
 infrastructure infringe infringed infringement infringements infringes infringing
 inherent inherit inheritance inherited inherits ini init initial initialization
 initialize initialized initializer initializes initializing initially initiate
-initiation inits inject injection injections injury inline inlined inliner
+initiated initiation inits inject injection injections injury inline inlined inliner
 inlining inner inno innodb inplace input inputs ins insecure insensitive insert
 inserted inserting insertion inserts insets inside insists inspect inspected
 inspector inspectors inst install installation installations installed installer
@@ -440,8 +440,8 @@ omitted omitting once onchange onclick one ones onfocus ongoing onkeydown onkeyu
 online onload only onmousedown onmousemove onmouseout onmouseover onmouseup
 onreadystatechange onresize onscroll onsubmit onto ontology ontoprise oome oops
 ooq open opened openfire opening openjpa opens opera operand operands operate
-operates operating operation operations operator operators oplus opposite ops opt
-optimal optimisation optimised optimistic optimizable optimization optimizations
+operates operating operation operational operations operator operators oplus opposite
+ops opt optimal optimisation optimised optimistic optimizable optimization optimizations
 optimize optimized optimizer optimizing option optional optionally options ora
 oracle orange oranges orchestration order orderable ordered orderid ordering
 orders ordf ordinal ordinary ordinate ordm ordplugins ordsys oren org organic