LPS-200583 Simplify: enforce number of files for the current request is not higher than combo.max.files value. This still allows caching more files than combo.max.files globally, because we cache many responses. We guarantee however that no element in cache contains more than combo.max.files

Author: dsanz

portal-impl/src/com/liferay/portal/servlet/ComboServlet.java

@@ -307,23 +307,9 @@ protected void doService(
 			if (cacheEnabled && (modulePathsString != null) &&
 				!PropsValues.COMBO_CHECK_TIMESTAMP) {
 
-				if (modulePaths.length <= PropsValues.COMBO_MAX_FILES) {
-					int totalFilesCount = 0;
+				if (PropsValues.COMBO_MAX_FILES > 0 &&
+					modulePaths.length > PropsValues.COMBO_MAX_FILES) {
 
-					List<String> keys = _bytesArrayPortalCache.getKeys();
-
-					for (String key : keys) {
-						byte[][] curBytesArray = _bytesArrayPortalCache.get(
-							key);
-
-						totalFilesCount += curBytesArray.length;
-
-						if (totalFilesCount > PropsValues.COMBO_MAX_FILES) {
-							return;
-						}
-					}
-				}
-				else {
 					httpServletResponse.setHeader(
 						HttpHeaders.CACHE_CONTROL,
 						HttpHeaders.CACHE_CONTROL_NO_CACHE_VALUE);
@@ -333,7 +319,7 @@ protected void doService(
 
 					if (_log.isWarnEnabled()) {
 						_log.warn(
-							"ComboServlet request exceeded maximum file count")
+							"ComboServlet request exceeded maximum file count");
 					}
 
 					return;