fix:NoClassDefFoundError of TransactionFactory (#521)
* fix:NoClassDefFoundError of TransactionFactory --------- Co-authored-by: zhangpeng <xinniankuailezp@163.com>
This commit is contained in:
parent
839cf3ce6f
commit
d8515a32f7
@ -113,12 +113,13 @@ public class DynamicDataSourceCreatorAutoConfiguration {
|
|||||||
public Dbcp2DataSourceCreator dbcp2DataSourceCreator(DynamicDataSourceProperties properties) {
|
public Dbcp2DataSourceCreator dbcp2DataSourceCreator(DynamicDataSourceProperties properties) {
|
||||||
return new Dbcp2DataSourceCreator(properties.getDbcp2());
|
return new Dbcp2DataSourceCreator(properties.getDbcp2());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 存在Atomikos数据源时, 加入创建器
|
* 存在Atomikos数据源时, 加入创建器
|
||||||
*/
|
*/
|
||||||
@ConditionalOnClass(AtomikosDataSourceBean.class)
|
@ConditionalOnClass({AtomikosDataSourceBean.class,TransactionFactory.class})
|
||||||
@Configuration
|
@Configuration
|
||||||
static class AtomikosDataSourceCreatorConfiguration {
|
static class AtomikosDataSourceCreatorConfiguration {
|
||||||
|
|
||||||
@ -129,10 +130,9 @@ public class DynamicDataSourceCreatorAutoConfiguration {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnClass(TransactionFactory.class)
|
|
||||||
public TransactionFactory atomikosTransactionFactory() {
|
public TransactionFactory atomikosTransactionFactory() {
|
||||||
return new AtomikosTransactionFactory();
|
return new AtomikosTransactionFactory();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user