diff --git a/core/src/main/java/org/ehcache/core/EhcacheManager.java b/core/src/main/java/org/ehcache/core/EhcacheManager.java index 247c54b74a..f53eb367ed 100644 --- 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 CacheConfiguration adjustConfigurationWithCacheManagerDefau if (preConfiguredCacheLoaderWriterConfig != null) { configurationList.add(preConfiguredCacheLoaderWriterConfig); } + if (loaderWriterProvider.isLoaderJsrProvided(alias)) { + configurationList.add(new CacheLoaderWriterConfiguration() { + }); + } } ServiceConfiguration[] serviceConfigurations = new ServiceConfiguration[configurationList.size()]; diff --git a/impl/src/main/java/org/ehcache/impl/internal/store/loaderwriter/LoaderWriterStoreProvider.java b/impl/src/main/java/org/ehcache/impl/internal/store/loaderwriter/LoaderWriterStoreProvider.java index 24ecf15c05..d50d5bde9c 100644 --- a/impl/src/main/java/org/ehcache/impl/internal/store/loaderwriter/LoaderWriterStoreProvider.java +++ b/impl/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 Store createStore(boolean useLoaderInAtomics, Store.Configuration 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 store = underlyingStoreProvider.createStore(useLoaderInAtomics , storeConfig, serviceConfigs); @@ -66,7 +65,7 @@ public void initStore(Store resource) { @Override public int rank(Set> resourceTypes, Collection> serviceConfigs) { - CacheLoaderWriterConfiguration loaderWriterConfiguration = findSingletonAmongst(DefaultCacheLoaderWriterConfiguration.class, serviceConfigs); + CacheLoaderWriterConfiguration loaderWriterConfiguration = findSingletonAmongst(CacheLoaderWriterConfiguration.class, serviceConfigs); if (loaderWriterConfiguration == null) { return 0; }