Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 780ede1c by Tony CHEMIT at 2017-12-30T19:47:20+01:00 fix services cache - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java - services-test/src/main/java/fr/ird/observe/services/test/TestMethodRule.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java +++ b/client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java @@ -39,7 +39,6 @@ public class ObserveDataSourceServicesProvider extends ObserveServicesProviderSu private final MutableClassMap<ObserveService> cache; private final ClientDataSource dataSource; - private boolean closed; public ObserveDataSourceServicesProvider(ClientDataSource dataSource) { this.dataSource = dataSource; @@ -59,15 +58,11 @@ public class ObserveDataSourceServicesProvider extends ObserveServicesProviderSu @Override public void close() { cache.clear(); - closed = true; } @SuppressWarnings("unchecked") @Override public <S extends ObserveService> S getService(Class<S> serviceType) { - if (closed) { - throw new IllegalStateException("Services provider was closed."); - } S result = (S) cache.get(serviceType); if (result == null) { result = newService(serviceType); ===================================== services-test/src/main/java/fr/ird/observe/services/test/TestMethodRule.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/test/TestMethodRule.java +++ b/services-test/src/main/java/fr/ird/observe/services/test/TestMethodRule.java @@ -252,7 +252,8 @@ public abstract class TestMethodRule implements TestRuleContract { protected ReferentialDtoCache getReferentialCache() { if (referentialCache == null) { - referentialCache = new ReferentialDtoCache(() -> { + referentialCache = new ReferentialDtoCache(); + referentialCache.setReferentialService(() -> { try { return newService(ReferentialService.class); } catch (DatabaseConnexionNotAuthorizedException | DatabaseNotFoundException | BabModelVersionException e) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/780ede1c6edd2358541d770bc243... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/780ede1c6edd2358541d770bc243... You're receiving this email because of your account on gitlab.com.