BroadleafCommerce#935 - Cache the actual resource that was created immediately after bundling. In multi-site edition, other resources that can use a previously created bundle fail because the path name gets generated with the site id of the first creating site.

Author: bpolster

common/src/main/java/org/broadleafcommerce/common/resource/service/ResourceBundlingServiceImpl.java

@@ -90,7 +90,7 @@ public class ResourceBundlingServiceImpl implements ResourceBundlingService {
 
     private KeyLockManager keyLockManager = KeyLockManagers.newLock();
 
-    private ConcurrentHashMap<String, String> createdBundles = new ConcurrentHashMap<String, String>();
+    private ConcurrentHashMap<String, Resource> createdBundles = new ConcurrentHashMap<String, Resource>();
 
     @Override
     public String resolveBundleResourceName(String requestedBundleName, String mappingPrefix, List<String> files) {
@@ -139,8 +139,7 @@ public String resolveBundleResourceName(String requestedBundleName, String mappi
 
     @Override
     public Resource resolveBundleResource(String versionedBundleResourceName) {
-        versionedBundleResourceName = lookupBundlePath(versionedBundleResourceName);
-        return readBundle(versionedBundleResourceName);
+        return createdBundles.get(lookupBundlePath(versionedBundleResourceName));
     }
 
     @Override
@@ -174,15 +173,15 @@ protected void createBundleIfNeeded(final String versionedBundleName, final List
 
                 @Override
                 public void doInLock() {
-                    Resource bundle = readBundle(versionedBundleName);
-                    if (bundle == null || !bundle.exists()) {
-                        Resource bundleResource = createBundle(versionedBundleName, filePaths, resolverChain, locations);
+                    Resource bundleResource = createdBundles.get(versionedBundleName);
+                    if (bundleResource == null || !bundleResource.exists()) {
+                        bundleResource = createBundle(versionedBundleName, filePaths, resolverChain, locations);
                         if (bundleResource != null) {
                             saveBundle(bundleResource);
                         }
                     }
-
-                    createdBundles.put(versionedBundleName, versionedBundleName);
+                    Resource savedResource = readBundle(versionedBundleName);
+                    createdBundles.put(versionedBundleName, savedResource);
                 }
             });
         }