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

[Minor] Small fixes

This commit is contained in:
Robert von Burg 2017-04-25 19:47:15 +02:00
parent ac9d24802c
commit f331babd3d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDbConnectionBuilder.java
View File

@ -53,7 +53,6 @@ public final class PostgreSqlDbConnectionBuilder extends DbConnectionBuilder {
ds.validate(); ds.validate();
} }
@SuppressWarnings("resource")
@Override @Override
public DataSource build(String realm, String url, String username, String password, Properties props) { public DataSource build(String realm, String url, String username, String password, Properties props) {
@ -188,7 +187,7 @@ public final class PostgreSqlDbConnectionBuilder extends DbConnectionBuilder {
* @see com.zaxxer.hikari.HikariDataSource#shutdown() * @see com.zaxxer.hikari.HikariDataSource#shutdown()
*/ */
public void shutdown() { public void shutdown() {
this.ds.shutdown(); this.ds.close();
} }
/** /**

4
li.strolch.service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java
View File

@ -157,7 +157,7 @@ public class StartActivityExecutionServiceTest extends RuntimeMock {
doServiceAssertResult(cert, svc, arg); doServiceAssertResult(cert, svc, arg);
// allow execution handler to do work // allow execution handler to do work
Thread.sleep(10); Thread.sleep(50);
try (StrolchTransaction tx = getRealm("execution").openTx(cert, StartActivityExecutionServiceTest.class)) { try (StrolchTransaction tx = getRealm("execution").openTx(cert, StartActivityExecutionServiceTest.class)) {
Action action; Action action;
@ -220,7 +220,7 @@ public class StartActivityExecutionServiceTest extends RuntimeMock {
assertEquals(State.EXECUTION, activity.getState()); assertEquals(State.EXECUTION, activity.getState());
} }
Thread.sleep(150L); Thread.sleep(100L);
try (StrolchTransaction tx = getRealm("execution").openTx(cert, StartActivityExecutionServiceTest.class)) { try (StrolchTransaction tx = getRealm("execution").openTx(cert, StartActivityExecutionServiceTest.class)) {
Action action; Action action;