Ignore files from the classpath for scss cache timestamps (#14506)

Change-Id: I82e3caef915b6a8683608f1834130468b3f16dbf

diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index 09b8a22a46ac6294eb67a37545e43ea5914f26d6..4656f9a67272c2a62338d7de0d8fa392ecdcfeb3 100644 (file)
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -77,10 +77,20 @@ public class VaadinServlet extends HttpServlet implements Constants {
             long newest = 0;
             for (String uri : sourceUris) {
                 File file = new File(uri);
-                if (!file.exists()) {
-                    return -1;
-                } else {
+                if (file.exists()) {
                     newest = Math.max(newest, file.lastModified());
+                } else if (!uri.startsWith("VAADIN/")) {
+                    /*
+                     * Ignore missing files starting with VAADIN/ since those
+                     * are fetched from the classpath, report problem and abort
+                     * for other files.
+                     */
+                    getLogger()
+                            .log(Level.WARNING,
+                                    "Could not resolve timestamp for {0}, Scss on the fly caching will be disabled",
+                                    uri);
+                    // -1 means this cache entry will never be valid
+                    return -1;
                 }
             }