Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Pull request #648: RED-6224: Fixed acl multitenancy datasource connection

Browse Source 
Merge in RED/persistence-service from RED-6224 to master

* commit 'a96d5aa5cdbb1094419f90e479c8c316f54bb2fd':
  RED-6224: Fixed acl multitenancy datasource connection
This commit is contained in:
Dominique Eiflaender 2023-03-29 15:54:11 +02:00
commit a2261e081f
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/multitenancy/persistence/TenantPersistenceConfig.java
View File

@ -18,7 +18,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
import org.springframework.context.annotation.Primary;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.orm.hibernate5.SpringBeanContainer;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@ -27,7 +26,6 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
import com.iqser.red.service.persistence.management.v1.processor.service.EncryptionDecryptionService;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.mulitenancy.CurrentTenantIdentifierResolverImpl;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.mulitenancy.DynamicDataSourceBasedMultiTenantConnectionProvider;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.mulitenancy.MultiTenantDataSource;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.mulitenancy.repository.TenantRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ColorsRepository;

2
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/mulitenancy/MultiTenantDataSource.java
View File

@ -28,7 +28,7 @@ public class MultiTenantDataSource implements DataSource {
@Override
public Connection getConnection() throws SQLException {
return getActiveDataSource().getConnection();
return dsd.getConnection(TenantContext.getTenantId());
}