github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#10295] Configuration.transactionProvider() is null after deserialisation

Browse Source
This commit is contained in:
Lukas Eder 2020-06-19 13:06:20 +02:00
parent 34d479cd96
commit 92285a998b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
View File

@ -1340,7 +1340,11 @@ public class DefaultConfiguration implements Configuration {
? ((ThreadLocalTransactionProvider) tp).localConnectionProvider
: (ConnectionProvider) data(DATA_DEFAULT_TRANSACTION_PROVIDER_CONNECTION);
return transactional == null ? connectionProvider : transactional;
return transactional != null
? transactional
: connectionProvider != null
? connectionProvider
: new NoConnectionProvider();
}
@Override
@ -1383,9 +1387,8 @@ public class DefaultConfiguration implements Configuration {
// [#3229] If transactions are used in client code, the default behaviour
// is assumed automatically, for convenience.
if (transactionProvider instanceof NoTransactionProvider) {
if (transactionProvider == null || transactionProvider instanceof NoTransactionProvider)
return new DefaultTransactionProvider(connectionProvider);
}
return transactionProvider;
}