LPS-54998 - Cache result from PortalWebResourcesUtil

michaelhashimoto · Apr 24, 2015 · 75e3e70 · 75e3e70
1 parent 16c6a8a
commit 75e3e70
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/util-taglib/src/com/liferay/taglib/FileAvailabilityUtil.java b/util-taglib/src/com/liferay/taglib/FileAvailabilityUtil.java
@@ -44,10 +44,6 @@ public static boolean isAvailable(
 			return true;
 		}
 
-		if (PortalWebResourcesUtil.isResourceAvailable(path)) {
-			return true;
-		}
-
 		Map<String, Boolean> availabilities = _getAvailabilities(
 			servletContext);
 
@@ -66,7 +62,9 @@ public static boolean isAvailable(
 		catch (Exception e) {
 		}
 
-		if (url == null) {
+		if ((url == null) &&
+			!PortalWebResourcesUtil.isResourceAvailable(path)) {
+
 			available = Boolean.FALSE;
 		}
 		else {