1.1 --- a/org/sonews/daemon/AbstractDaemon.java	Wed Jul 01 10:48:22 2009 +0200
     1.2 +++ b/org/sonews/daemon/AbstractDaemon.java	Wed Jul 22 14:04:05 2009 +0200
     1.3 @@ -19,7 +19,7 @@
     1.4  package org.sonews.daemon;
     1.5  
     1.6  import java.sql.SQLException;
     1.7 -import org.sonews.daemon.storage.Database;
     1.8 +import org.sonews.storage.StorageManager;
     1.9  import org.sonews.util.Log;
    1.10  
    1.11  /**
    1.12 @@ -56,21 +56,17 @@
    1.13    }
    1.14    
    1.15    /**
    1.16 -   * Marks this thread to exit soon. Closes the associated Database connection
    1.17 +   * Marks this thread to exit soon. Closes the associated JDBCDatabase connection
    1.18     * if available.
    1.19     * @throws java.sql.SQLException
    1.20     */
    1.21 -  void shutdownNow()
    1.22 +  public void shutdownNow()
    1.23      throws SQLException
    1.24    {
    1.25      synchronized(this)
    1.26      {
    1.27        this.isRunning = false;
    1.28 -      Database db = Database.getInstance(false);
    1.29 -      if(db != null)
    1.30 -      {
    1.31 -        db.shutdown();
    1.32 -      }
    1.33 +      StorageManager.disableProvider();
    1.34      }
    1.35    }
    1.36