FACES-2953 alloy components fail to load due to infinite loop of requ…

…ests in Pluto 3.0
liferay · Oct 27, 2016 · 9542656 · 9542656
1 parent 78a8b11
commit 9542656
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git a/reslib/src/main/java/com/liferay/faces/alloy/reslib/application/internal/ComboResource.java b/reslib/src/main/java/com/liferay/faces/alloy/reslib/application/internal/ComboResource.java
@@ -94,7 +94,8 @@ public InputStream getInputStream() throws IOException {
 			}
 
 			if ("text/css".equals(contentType)) {
-				resourceText = ExpressionUtil.filterExpressions(resourceText, resourceHandlerChain, externalContext);
+				resourceText = ExpressionUtil.filterResourceExpressions(resourceText, resourceHandlerChain,
+						externalContext);
 			}
 
 			comboResourceText.append(resourceText);

diff --git a/reslib/src/main/java/com/liferay/faces/alloy/reslib/application/internal/ExpressionUtil.java b/reslib/src/main/java/com/liferay/faces/alloy/reslib/application/internal/ExpressionUtil.java
@@ -32,7 +32,7 @@ private ExpressionUtil() {
 		throw new AssertionError();
 	}
 
-	/* package-priavte */ static String filterExpressions(String text, ResourceHandler resourceHandlerChain,
+	/* package-priavte */ static String filterResourceExpressions(String text, ResourceHandler resourceHandlerChain,
 		ExternalContext externalContext) {
 
 		int startPos = text.indexOf(RESOURCE_TOKEN_BEGIN);

diff --git a/...a/com/liferay/faces/alloy/reslib/application/internal/FilteredResourceExpressionImpl.java b/...a/com/liferay/faces/alloy/reslib/application/internal/FilteredResourceExpressionImpl.java
@@ -26,6 +26,10 @@
  */
 public class FilteredResourceExpressionImpl extends FilteredResourceBase {
 
+	// Private Constants
+	private static final String COMBO_MODULE_PATHS_DELIMITER = "#{comboModulePathsDelimiter}";
+	private static final String SCRIPT_MODULE_PATHS_DELIMITER = "#{scriptModulePathsDelimiter}";
+
 	// Private Members
 	private Resource wrappedResource;
 
@@ -44,7 +48,34 @@ protected String filter(String text) {
 		FacesContext facesContext = FacesContext.getCurrentInstance();
 		ResourceHandler resourceHandlerChain = facesContext.getApplication().getResourceHandler();
 		ExternalContext externalContext = facesContext.getExternalContext();
+		String comboModulePathsDelimiter = getModulePathsDelimiter("combo", resourceHandlerChain, externalContext);
+		String scriptModulePathsDelimiter = getModulePathsDelimiter("script", resourceHandlerChain, externalContext);
+		text = text.replace(COMBO_MODULE_PATHS_DELIMITER, comboModulePathsDelimiter);
+		text = text.replace(SCRIPT_MODULE_PATHS_DELIMITER, scriptModulePathsDelimiter);
+
+		return ExpressionUtil.filterResourceExpressions(text, resourceHandlerChain, externalContext);
+	}
+
+	private String getModulePathsDelimiter(String resourceName, ResourceHandler resourceHandlerChain,
+		ExternalContext externalContext) {
+
+		String modulePathsDelimiter = "&";
+		Resource resource = resourceHandlerChain.createResource(resourceName, ResLibResourceHandler.LIBRARY_NAME);
+
+		if (resource != null) {
+
+			String requestPath = resource.getRequestPath();
+
+			if (requestPath != null) {
+
+				String resourceURL = externalContext.encodeResourceURL(requestPath);
+
+				if (!resourceURL.contains("?")) {
+					modulePathsDelimiter = "?";
+				}
+			}
+		}
 
-		return ExpressionUtil.filterExpressions(text, resourceHandlerChain, externalContext);
+		return modulePathsDelimiter;
 	}
 }
diff --git a/reslib/src/main/resources/META-INF/resources/liferay-faces-alloy-reslib/liferay.js b/reslib/src/main/resources/META-INF/resources/liferay-faces-alloy-reslib/liferay.js
@@ -1,8 +1,8 @@
 ;(function() {
 	window.YUI_config = {
-		base: "#{resource['liferay-faces-alloy-reslib:script']}&",
+		base: "#{resource['liferay-faces-alloy-reslib:script']}#{scriptModulePathsDelimiter}",
 		combine: true,
-		comboBase: "#{resource['liferay-faces-alloy-reslib:combo']}&",
+		comboBase: "#{resource['liferay-faces-alloy-reslib:combo']}#{comboModulePathsDelimiter}",
 		root: 'build/',
 	};
 })();