diff -r 6fceb66e1ad7 -r 70028c8a63fd org/sonews/daemon/AbstractDaemon.java
--- a/org/sonews/daemon/AbstractDaemon.java	Fri Jun 26 16:48:50 2009 +0200
+++ b/org/sonews/daemon/AbstractDaemon.java	Wed Aug 12 16:43:30 2009 +0200
@@ -19,7 +19,7 @@
 package org.sonews.daemon;
 
 import java.sql.SQLException;
-import org.sonews.daemon.storage.Database;
+import org.sonews.storage.StorageManager;
 import org.sonews.util.Log;
 
 /**
@@ -56,21 +56,17 @@
   }
   
   /**
-   * Marks this thread to exit soon. Closes the associated Database connection
+   * Marks this thread to exit soon. Closes the associated JDBCDatabase connection
    * if available.
    * @throws java.sql.SQLException
    */
-  void shutdownNow()
+  public void shutdownNow()
     throws SQLException
   {
     synchronized(this)
     {
       this.isRunning = false;
-      Database db = Database.getInstance(false);
-      if(db != null)
-      {
-        db.shutdown();
-      }
+      StorageManager.disableProvider();
     }
   }