transform NavigableMap for map using toFlatConfig method (#294)

bertramdev · Feb 2, 2022 · 7916072 · 7916072
1 parent a11c5ea
commit 7916072
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/asset-pipeline-grails/src/main/groovy/asset/pipeline/AssetPipelineGrailsPlugin.groovy b/asset-pipeline-grails/src/main/groovy/asset/pipeline/AssetPipelineGrailsPlugin.groovy
@@ -103,7 +103,7 @@ class AssetPipelineGrailsPlugin extends grails.plugins.Plugin {
         }
 
 
-        AssetPipelineConfigHolder.config = assetsConfig
+        AssetPipelineConfigHolder.config = assetsConfig.toFlatConfig()
         if (BuildSettings.TARGET_DIR) {
             AssetPipelineConfigHolder.config.cacheLocation = new File((File) BuildSettings.TARGET_DIR, ".assetcache").canonicalPath
         }

diff --git a/asset-pipeline-grails/src/main/groovy/asset/pipeline/grails/AssetProcessorService.groovy b/asset-pipeline-grails/src/main/groovy/asset/pipeline/grails/AssetProcessorService.groovy
@@ -4,6 +4,7 @@ package asset.pipeline.grails
 import asset.pipeline.AssetHelper
 import grails.core.GrailsApplication
 import grails.util.Environment
+import org.grails.config.NavigableMap
 
 import javax.annotation.Resource
 import javax.servlet.http.HttpServletRequest
@@ -109,8 +110,9 @@ class AssetProcessorService {
 	}
 
 
-	String assetBaseUrl(final HttpServletRequest req, final UrlBase urlBase, final Map conf = grailsApplication.config.getProperty('grails.assets',Map,[:])) {
-		final String url = getConfigBaseUrl(req, conf)
+	String assetBaseUrl(final HttpServletRequest req, final UrlBase urlBase, final NavigableMap conf = grailsApplication.config.getProperty('grails.assets',Map,[:])) {
+		Map map = conf.toFlatConfig()
+		final String url = getConfigBaseUrl(req, map)
 		if (url) {
 			return url
 		}