Merge "Prevents scss files leaking out into the web content folder when an exception is thrown during linking (#10594)"

1 files changed, 4 insertions, 5 deletions

diff --git a/client-compiler/src/com/vaadin/sass/linker/SassLinker.java b/client-compiler/src/com/vaadin/sass/linker/SassLinker.java
index 6aad66fc53..88178ba1d0 100644
--- a/client-compiler/src/com/vaadin/sass/linker/SassLinker.java
+++ b/client-compiler/src/com/vaadin/sass/linker/SassLinker.java
@@ -65,6 +65,10 @@ public class SassLinker extends AbstractLinker {
                 // Create the temporary files.
                 String partialPath = resource.getPartialPath();
                 if (partialPath.endsWith(".scss")) {
+                    // In my opinion, the SCSS file does not need to be
+                    // output to the web content folder, as they can't
+                    // be used there
+                    toReturn.remove(resource);
 
                     String fileName = partialPath;
                     File path = tempFolder;
@@ -89,11 +93,6 @@ public class SassLinker extends AbstractLinker {
 
                             // Store the file info for the compilation
                             scssFiles.add(new FileInfo(tempfile, partialPath));
-
-                            // In my opinion, the SCSS file does not need to be
-                            // output to the web content folder, as they can't
-                            // be used there
-                            toReturn.remove(resource);
                         } else {
                             logger.log(TreeLogger.WARN, "Duplicate file "
                                     + tempfile.getPath());