diff --git a/src/nl/astraeus/database/Persister.java b/src/nl/astraeus/database/Persister.java index 869eafd..9021100 100644 --- a/src/nl/astraeus/database/Persister.java +++ b/src/nl/astraeus/database/Persister.java @@ -2,7 +2,6 @@ import nl.astraeus.database.jdbc.ConnectionPool; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; @@ -17,11 +16,9 @@ private static ThreadLocal transactions = new ThreadLocal(); private static Map, ObjectPersister> objectPersisters = new HashMap<>(); - private static DataSource dataSource; - private static ConnectionPool connectionPool; static { - connectionPool.setConnectionProvider(new ConnectionProvider() { + ConnectionPool.get().setConnectionProvider(new ConnectionProvider() { @Override public Connection getConnection() { try { @@ -33,10 +30,8 @@ return connection; } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException(e); } catch (SQLException e) { - e.printStackTrace(); throw new IllegalStateException(e); } } @@ -52,7 +47,7 @@ } public static void begin() { - transactions.set(new Transaction(connectionPool.getConnection())); + transactions.set(new Transaction(ConnectionPool.get().getConnection())); } public static void commit() {