Trim line from LineInfo only once

spring-projects · Jan 7, 2020 · c480a99 · c480a99
1 parent 55e0ff1
commit c480a99
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/.../src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java b/.../src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java
@@ -68,13 +68,13 @@
  */
 public class AppCacheManifestTransformer extends ResourceTransformerSupport {
 
-	private static final Collection<String> MANIFEST_SECTION_HEADERS =
-			Arrays.asList("CACHE MANIFEST", "NETWORK:", "FALLBACK:", "CACHE:");
-
 	private static final String MANIFEST_HEADER = "CACHE MANIFEST";
 
 	private static final String CACHE_HEADER = "CACHE:";
 
+	private static final Collection<String> MANIFEST_SECTION_HEADERS =
+			Arrays.asList(MANIFEST_HEADER, "NETWORK:", "FALLBACK:", CACHE_HEADER);
+
 	private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
 	private static final Log logger = LogFactory.getLog(AppCacheManifestTransformer.class);
@@ -212,8 +212,9 @@ private static class LineInfo {
 
 
 		private static boolean initCacheSectionFlag(String line, @Nullable LineInfo previousLine) {
-			if (MANIFEST_SECTION_HEADERS.contains(line.trim())) {
-				return line.trim().equals(CACHE_HEADER);
+			String trimmedLine = line.trim();
+			if (MANIFEST_SECTION_HEADERS.contains(trimmedLine)) {
+				return trimmedLine.equals(CACHE_HEADER);
 			}
 			else if (previousLine != null) {
 				return previousLine.isCacheSection();

diff --git a/...c/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java b/...c/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java
@@ -65,13 +65,13 @@
  */
 public class AppCacheManifestTransformer extends ResourceTransformerSupport {
 
-	private static final Collection<String> MANIFEST_SECTION_HEADERS =
-			Arrays.asList("CACHE MANIFEST", "NETWORK:", "FALLBACK:", "CACHE:");
-
 	private static final String MANIFEST_HEADER = "CACHE MANIFEST";
 
 	private static final String CACHE_HEADER = "CACHE:";
 
+	private static final Collection<String> MANIFEST_SECTION_HEADERS =
+			Arrays.asList(MANIFEST_HEADER, "NETWORK:", "FALLBACK:", CACHE_HEADER);
+
 	private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
 	private static final Log logger = LogFactory.getLog(AppCacheManifestTransformer.class);
@@ -168,8 +168,9 @@ public LineInfo(String line, @Nullable LineInfo previous) {
 		}
 
 		private static boolean initCacheSectionFlag(String line, @Nullable LineInfo previousLine) {
-			if (MANIFEST_SECTION_HEADERS.contains(line.trim())) {
-				return line.trim().equals(CACHE_HEADER);
+			String trimmedLine = line.trim();
+			if (MANIFEST_SECTION_HEADERS.contains(trimmedLine)) {
+				return trimmedLine.equals(CACHE_HEADER);
 			}
 			else if (previousLine != null) {
 				return previousLine.isCacheSection();