Use classloader also to find theme styles.scss (#10107)

Change-Id: I4fb5790dc23e8c5cedfc2113158181abf646245e

diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index 2ef95508231ffdcedc82fa4fafb709bd55237e04..23378e4c2005125b7b38e6e9d37a7665ac33d1ce 100644 (file)
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -936,6 +936,17 @@ public class VaadinServlet extends HttpServlet implements Constants {
         }
         String realFilename = sc.getRealPath(scssFilename);
         ScssStylesheet scss = ScssStylesheet.get(realFilename);
+        if (scss == null) {
+            // Not a file in the file system (WebContent directory). Use the
+            // identifier directly (VAADIN/themes/.../styles.css) so
+            // ScssStylesheet will try using the class loader.
+            if (scssFilename.startsWith("/")) {
+                scssFilename = scssFilename.substring(1);
+            }
+
+            scss = ScssStylesheet.get(scssFilename);
+        }
+
         if (scss == null) {
             getLogger()
                     .warning(