Make sure temporary storage is closed, even if there is an error while

committing.

src/ZODB/Connection.py

@@ -1167,6 +1167,7 @@ class Connection(ExportImport, object):
         self._storage = self._normal_storage
         self._savepoint_storage = None
 
+        try:
             self._log.debug("Committing savepoints of size %s", src.getSize())
             oids = src.index.keys()
 
@@ -1178,11 +1179,13 @@ class Connection(ExportImport, object):
                 data, serial = src.load(oid, src)
                 obj = self._cache.get(oid, None)
                 if obj is not None:
-                self._cache.update_object_size_estimation(obj._p_oid, len(data))
+                    self._cache.update_object_size_estimation(
+                        obj._p_oid, len(data))
                     obj._p_estimated_size = len(data)
                 if isinstance(self._reader.getGhost(data), Blob):
                     blobfilename = src.loadBlob(oid, serial)
-                s = self._storage.storeBlob(oid, serial, data, blobfilename,
+                    s = self._storage.storeBlob(
+                        oid, serial, data, blobfilename,
                         '', transaction)
                     # we invalidate the object here in order to ensure
                     # that that the next attribute access of its name
@@ -1194,6 +1197,7 @@ class Connection(ExportImport, object):
                                             '', transaction)
 
                 self._handle_serial(s, oid, change=False)
+        finally:
             src.close()
 
     def _abort_savepoint(self):