From 0b2e1caca92f64c6ac332bfbafc1846323726c91 Mon Sep 17 00:00:00 2001 From: michael Date: Wed, 26 Dec 2012 10:26:30 +0200 Subject: [PATCH] Prevents scss files leaking out into the web content folder when an exception is thrown during linking (#10594) Change-Id: I6c29b5c08722f5a90095d76c93be3ec949c15c9d --- .../src/com/vaadin/sass/linker/SassLinker.java | 9 ++++----- 1 file 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()); -- 2.39.5