Wire in JSR provided loaders ehcache#2456

AbfrmBlr · Sep 5, 2018 · c0c637b · c0c637b
1 parent 5207cbc
commit c0c637b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/core/src/main/java/org/ehcache/core/EhcacheManager.java b/core/src/main/java/org/ehcache/core/EhcacheManager.java
@@ -547,6 +547,10 @@ private <K, V> CacheConfiguration<K, V> adjustConfigurationWithCacheManagerDefau
       if (preConfiguredCacheLoaderWriterConfig != null) {
         configurationList.add(preConfiguredCacheLoaderWriterConfig);
       }
+      if (loaderWriterProvider.isLoaderJsrProvided(alias)) {
+        configurationList.add(new CacheLoaderWriterConfiguration() {
+        });
+      }
     }
 
     ServiceConfiguration<?>[] serviceConfigurations = new ServiceConfiguration<?>[configurationList.size()];

diff --git a/...src/main/java/org/ehcache/impl/internal/store/loaderwriter/LoaderWriterStoreProvider.java b/...src/main/java/org/ehcache/impl/internal/store/loaderwriter/LoaderWriterStoreProvider.java
@@ -18,7 +18,6 @@
 import org.ehcache.config.ResourceType;
 import org.ehcache.core.internal.store.StoreSupport;
 import org.ehcache.core.spi.store.Store;
-import org.ehcache.impl.config.loaderwriter.DefaultCacheLoaderWriterConfiguration;
 import org.ehcache.impl.internal.concurrent.ConcurrentHashMap;
 import org.ehcache.spi.loaderwriter.CacheLoaderWriterConfiguration;
 import org.ehcache.spi.service.Service;
@@ -42,7 +41,7 @@ public class LoaderWriterStoreProvider implements Store.Provider {
 
   @Override
   public <K, V> Store<K, V> createStore(boolean useLoaderInAtomics, Store.Configuration<K, V> storeConfig, ServiceConfiguration<?>... serviceConfigs) {
-    CacheLoaderWriterConfiguration loaderWriterConfiguration = findSingletonAmongst(DefaultCacheLoaderWriterConfiguration.class, serviceConfigs);
+    CacheLoaderWriterConfiguration loaderWriterConfiguration = findSingletonAmongst(CacheLoaderWriterConfiguration.class, serviceConfigs);
     Store.Provider underlyingStoreProvider = selectProvider(storeConfig.getResourcePools().getResourceTypeSet(),
             Arrays.asList(serviceConfigs), loaderWriterConfiguration);
     Store<K, V> store = underlyingStoreProvider.createStore(useLoaderInAtomics , storeConfig, serviceConfigs);
@@ -66,7 +65,7 @@ public void initStore(Store<?, ?> resource) {
 
   @Override
   public int rank(Set<ResourceType<?>> resourceTypes, Collection<ServiceConfiguration<?>> serviceConfigs) {
-    CacheLoaderWriterConfiguration loaderWriterConfiguration = findSingletonAmongst(DefaultCacheLoaderWriterConfiguration.class, serviceConfigs);
+    CacheLoaderWriterConfiguration loaderWriterConfiguration = findSingletonAmongst(CacheLoaderWriterConfiguration.class, serviceConfigs);
     if (loaderWriterConfiguration == null) {
       return 0;
     }