diff -r dd05c3f2fa24 -r 087ef6fe6a1a org/sonews/storage/impl/JDBCDatabase.java --- a/org/sonews/storage/impl/JDBCDatabase.java Fri Dec 25 15:42:46 2009 +0100 +++ b/org/sonews/storage/impl/JDBCDatabase.java Wed May 12 11:18:02 2010 +0200 @@ -52,7 +52,7 @@ public class JDBCDatabase implements Storage { - public static final int MAX_RESTARTS = 3; + public static final int MAX_RESTARTS = 2; private Connection conn = null; private PreparedStatement pstmtAddArticle1 = null; @@ -110,13 +110,13 @@ { // Load database driver Class.forName( - Config.inst().get(Config.STORAGE_DBMSDRIVER, "java.lang.Object")); + Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_DBMSDRIVER, "java.lang.Object")); // Establish database connection this.conn = DriverManager.getConnection( - Config.inst().get(Config.STORAGE_DATABASE, ""), - Config.inst().get(Config.STORAGE_USER, "root"), - Config.inst().get(Config.STORAGE_PASSWORD, "")); + Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_DATABASE, ""), + Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_USER, "root"), + Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_PASSWORD, "")); this.conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE); if(this.conn.getTransactionIsolation() != Connection.TRANSACTION_SERIALIZABLE)