[MMBASE SCM] r38609 - mmbase/trunk/core/src/main/java/org/mmbase/storage/implementation/database

[michiel]

Author: michiel
Date: 2009-09-14 17:57:32 +0200 (Mon, 14 Sep 2009)
New Revision: 38609

Modified:
   
mmbase/trunk/core/src/main/java/org/mmbase/storage/implementation/database/DatabaseStorageManager.java
Log:
some missing releaseActiveConnection

Modified: 
mmbase/trunk/core/src/main/java/org/mmbase/storage/implementation/database/DatabaseStorageManager.java
===================================================================
--- 
mmbase/trunk/core/src/main/java/org/mmbase/storage/implementation/database/DatabaseStorageManager.java
      2009-09-14 15:42:11 UTC (rev 38608)
+++ 
mmbase/trunk/core/src/main/java/org/mmbase/storage/implementation/database/DatabaseStorageManager.java
      2009-09-14 15:57:32 UTC (rev 38609)
@@ -236,6 +236,8 @@
             }
             activeConnection = null;
         }
+
+
     }
 
     // javadoc is inherited
@@ -335,6 +337,7 @@
             } else {
                 String query = "";
                 try {
+
                     getActiveConnection();
                     Statement s;
                     Scheme scheme = factory.getScheme(Schemes.UPDATE_SEQUENCE, 
Schemes.UPDATE_SEQUENCE_DEFAULT);
@@ -1753,10 +1756,10 @@
             log.warn(sqe);
             if (! wasinTransaction) {
                 rollback();
-            } else {
-                releaseActiveConnection();
             }
             throw new StorageException(sqe);
+        } finally {
+            releaseActiveConnection();
         }
     }
 
@@ -1780,7 +1783,7 @@
         }
         String tablename = (String) factory.getStorageIdentifier(builder);
         assert node.getIntValue("otype") > 0;
-        assert node.getNumber() > 0;
+        assert node.getNumber() > 0 : "node should have positive number" + 
node;
         delete(node, builder, blobFileField, tablename);
         assert node.getIntValue("otype") > 0;
         assert node.getNumber() > 0;
@@ -1828,10 +1831,9 @@
         } catch (SQLException se) {
             throw new StorageException(se);
         } finally {
+            releaseActiveConnection();
             assert node.getIntValue("otype") > 0;
             assert node.getNumber() > 0;
-
-            releaseActiveConnection();
         }
     }
 
@@ -2239,8 +2241,7 @@
             try {
                 s = activeConnection.prepareStatement(query);
                 s.executeUpdate();
-            }
-            finally {
+            } finally {
                 if (s != null) {
                     s.close();
                 }
@@ -3405,6 +3406,8 @@
             }
         } catch (SQLException sqe) {
             log.warn(sqe);
+        } finally {
+            releaseActiveConnection();
         }
     }
 

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs