Skip to content

Commit 32005af

Browse files
dwtalkJay Aisenbrey
authored andcommitted
#36 Added a reference to the bl-override-ehcache.xml that is already checked in
Even though bl-override-ehcache.xml was checked in it was never added to the cache overrides therefore the ehcache overrides were being ignored and the Broadleaf standard caches were still being used.
1 parent f3b59ed commit 32005af

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

api/src/main/java/com/community/api/configuration/ApiConfig.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ public EmbeddedServletContainerFactory tomcatEmbeddedServletContainerFactory(@Va
3939
tomcat.addAdditionalTomcatConnectors(createStandardConnector(httpServerPort));
4040
return tomcat;
4141
}
42+
43+
@Merge("blMergedCacheConfigLocations")
44+
public List<String> adminOverrideCache() {
45+
return Collections.singletonList("classpath:bl-override-ehcache.xml");
46+
}
4247

4348
private Connector createStandardConnector(int port) {
4449
Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");

0 commit comments

Comments
 (0)