Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

2 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java
    ... ... @@ -39,7 +39,6 @@ public class ObserveDataSourceServicesProvider extends ObserveServicesProviderSu
    39 39
    40 40 
         private final MutableClassMap<ObserveService> cache;
    41 41 
         private final ClientDataSource dataSource;
    42 
    -    private boolean closed;
    43 42
    44 43 
         public ObserveDataSourceServicesProvider(ClientDataSource dataSource) {
    45 44 
             this.dataSource = dataSource;
    ... ... @@ -59,15 +58,11 @@ public class ObserveDataSourceServicesProvider extends ObserveServicesProviderSu
    59 58 
         @Override
    60 59 
         public void close() {
    61 60 
             cache.clear();
    62 
    -        closed = true;
    63 61 
         }
    64 62
    65 63 
         @SuppressWarnings("unchecked")
    66 64 
         @Override
    67 65 
         public <S extends ObserveService> S getService(Class<S> serviceType) {
    68 
    -        if (closed) {
    69 
    -            throw new IllegalStateException("Services provider was closed.");
    70 
    -        }
    71 66 
             S result = (S) cache.get(serviceType);
    72 67 
             if (result == null) {
    73 68 
                 result = newService(serviceType);

  • services-test/src/main/java/fr/ird/observe/services/test/TestMethodRule.java
    ... ... @@ -252,7 +252,8 @@ public abstract class TestMethodRule implements TestRuleContract {
    252 252
    253 253 
         protected ReferentialDtoCache getReferentialCache() {
    254 254 
             if (referentialCache == null) {
    255 
    -            referentialCache = new ReferentialDtoCache(() -> {
    255 
    +            referentialCache = new ReferentialDtoCache();
    256 
    +            referentialCache.setReferentialService(() -> {
    256 257 
                     try {
    257 258 
                         return newService(ReferentialService.class);
    258 259 
                     } catch (DatabaseConnexionNotAuthorizedException | DatabaseNotFoundException | BabModelVersionException e) {

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.