Index: bundle/BundleDbPersistenceManager.java
===================================================================
--- bundle/BundleDbPersistenceManager.java	(revision 741078)
+++ bundle/BundleDbPersistenceManager.java	(working copy)
@@ -550,6 +550,7 @@
                 con.setAutoCommit(true);
                 return;
             } catch (Throwable th) {
+                clearBundleCache();
                 lastException = th;
                 try {
                     if (con != null) {
Index: bundle/AbstractBundlePersistenceManager.java
===================================================================
--- bundle/AbstractBundlePersistenceManager.java	(revision 741078)
+++ bundle/AbstractBundlePersistenceManager.java	(working copy)
@@ -727,4 +727,10 @@
         bundles.remove(id);
     }
 
+    /**
+     * Clears the bundle cache.
+     */
+    protected final void clearBundleCache() {
+        bundles.clear();
+    }
 }