Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] Adding deregister of PostgreSQL driver and change to 9.4

This commit is contained in:
Robert von Burg 2016-02-27 16:18:26 +01:00
parent a507c00015
commit 5d557a23c0
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
li.strolch.persistence.postgresql/pom.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>li.strolch</groupId> <groupId>li.strolch</groupId>
@ -50,7 +49,7 @@
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>9.3-1100-jdbc41</version> <version>9.4.1208.jre7</version>
</dependency> </dependency>
<!-- test --> <!-- test -->

10
li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlPersistenceHandler.java
View File

@ -22,7 +22,6 @@ import static ch.eitchnet.db.DbConstants.PROP_ALLOW_SCHEMA_MIGRATION;
import static li.strolch.agent.api.RealmHandler.SYSTEM_USER_DB_INITIALIZER; import static li.strolch.agent.api.RealmHandler.SYSTEM_USER_DB_INITIALIZER;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DriverManager;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@ -60,8 +59,6 @@ public class PostgreSqlPersistenceHandler extends StrolchComponent implements Pe
public static final String SCRIPT_PREFIX = "strolch"; //$NON-NLS-1$ public static final String SCRIPT_PREFIX = "strolch"; //$NON-NLS-1$
private Map<String, DataSource> dsMap; private Map<String, DataSource> dsMap;
private Driver driver;
public PostgreSqlPersistenceHandler(ComponentContainer container, String componentName) { public PostgreSqlPersistenceHandler(ComponentContainer container, String componentName) {
super(container, componentName); super(container, componentName);
} }
@ -69,8 +66,7 @@ public class PostgreSqlPersistenceHandler extends StrolchComponent implements Pe
@Override @Override
public void initialize(ComponentConfiguration componentConfiguration) throws Exception { public void initialize(ComponentConfiguration componentConfiguration) throws Exception {
this.driver = new Driver(); Driver.register();
DriverManager.registerDriver(this.driver);
DbConnectionBuilder connectionBuilder = new PostgreSqlDbConnectionBuilder(getContainer(), DbConnectionBuilder connectionBuilder = new PostgreSqlDbConnectionBuilder(getContainer(),
componentConfiguration); componentConfiguration);
@ -128,8 +124,8 @@ public class PostgreSqlPersistenceHandler extends StrolchComponent implements Pe
} }
} }
if (this.driver != null) if (Driver.isRegistered())
DriverManager.deregisterDriver(this.driver); Driver.deregister();
super.destroy(); super.destroy();
} }