LOB objects are now deleted (and the empty space is reused) when the transaction is committed.

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

@@ -140,7 +140,7 @@ public class LobStorage {
                 prep.setInt(1, tableId);
                 ResultSet rs = prep.executeQuery();
                 while (rs.next()) {
-                    deleteLob(rs.getLong(1));
+                    removeLob(rs.getLong(1));
                 }
                 reuse(sql, prep);
             } catch (SQLException e) {
@@ -298,8 +298,17 @@ public class LobStorage {
         prepared.put(sql, prep);
     }
 
-    private void deleteLob(long lob) throws SQLException {
+    /**
+     * Delete a LOB from the database.
+     *
+     * @param lob the lob id
+     */
+    public void removeLob(long lob) {
+        try {
             synchronized (handler) {
+                if (conn == null) {
+                    return;
+                }
                 String sql = "SELECT BLOCK, HASH FROM " + LOB_MAP + " D WHERE D.LOB = ? " +
                         "AND NOT EXISTS(SELECT 1 FROM " + LOB_MAP + " O " +
                         "WHERE O.BLOCK = D.BLOCK AND O.LOB <> ?)";
@@ -335,6 +344,9 @@ public class LobStorage {
                 prep.execute();
                 reuse(sql, prep);
             }
+        } catch (SQLException e) {
+            throw DbException.convert(e);
+        }
     }
 
     /**
@@ -416,7 +428,7 @@ public class LobStorage {
                 return registerLob(type, lobId, TABLE_TEMP, length);
             } catch (IOException e) {
                 if (lobId != -1) {
-                    deleteLob(lobId);
+                    removeLob(lobId);
                 }
                 throw DbException.convertIOException(e, "adding blob");
             }

h2/src/main/org/h2/value/ValueLobDb.java

@@ -120,17 +120,17 @@ public class ValueLobDb extends Value implements Value.ValueClob, Value.ValueBlo
             if (tempFile != null) {
                 tempFile.stopAutoDelete();
             }
-            deleteFile(handler, fileName);
-        }
-    }
-
-    private static synchronized void deleteFile(DataHandler handler, String fileName) {
             // synchronize on the database, to avoid concurrent temp file creation /
             // deletion / backup
             synchronized (handler.getLobSyncObject()) {
                 IOUtils.delete(fileName);
             }
         }
+        if (lobStorage != null) {
+            lobStorage.removeLob(lobId);
+            lobStorage = null;
+        }
+    }
 
     public void unlink() {
         if (small == null && tableId != LobStorage.TABLE_ID_SESSION_VARIABLE) {