--no commit message

--no commit message

h2/src/main/org/h2/store/DiskFile.java

@@ -863,10 +863,10 @@ public class DiskFile implements CacheWriter {
 
     void addRecord(Session session, Record record) throws SQLException {
         synchronized (database) {
+            cache.put(record);
             if (logChanges) {
                 log.add(session, this, record);
             }
-            cache.put(record);
         }
     }
 

h2/src/tools/org/h2/build/BuildBase.java

@@ -415,8 +415,15 @@ public class BuildBase {
     }
     
     protected void mkdir(String dir) {
-        if (!new File(dir).mkdirs()) {
-            throw new Error("Can not create directory " + dir);
+        File f = new File(dir);
+        if (f.exists()) {
+            if (f.isFile()) {
+                throw new Error("Can not create directory " + dir + " because a file with this name exists");
+            }
+        } else {
+            if (!f.mkdirs()) {
+                throw new Error("Can not create directory " + dir);
+            }                
         }
     }