fix conflict

2015-08-28 23:21:22 +02:00
parent 1e52cd0c30 3bcaa3f12b
commit 63889c030a
16 changed files with 145 additions and 78 deletions
@@ -135,12 +135,12 @@ public class MySQL implements DataSource {
        config.setPassword(this.password);
        config.addDataSourceProperty("cachePrepStmts", "true");
        config.addDataSourceProperty("prepStmtCacheSize", "250");
-        config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
+        config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
        config.addDataSourceProperty("autoReconnect", false);
        config.setInitializationFailFast(true); // Don't start the plugin if the database is unavariable
        config.setMaxLifetime(60000); // 60 Sec
        config.setIdleTimeout(45000); // 45 Sec
-        config.setMaximumPoolSize(50); // 50 Connections (including idle connections)
+        config.setMaximumPoolSize(50); // 50 Connections (including idle connections)
        ds = new HikariDataSource(config);
        ConsoleLogger.info("Connection arguments loaded, Hikari ConnectionPool ready!");
    }