From fae4b9a4ef5b166cd7bfde3114dc09294aa80f1f Mon Sep 17 00:00:00 2001 From: ruibaby Date: Tue, 16 Apr 2019 20:15:43 +0800 Subject: [PATCH] Clear cache when theme uploaded. --- .../java/run/halo/app/service/impl/ThemeServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java index e1dcfa5c3..1bc493c05 100644 --- a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java @@ -223,11 +223,11 @@ public class ThemeServiceImpl implements ThemeService { try { // Delete the folder - Files.deleteIfExists(Paths.get(themeProperty.getThemePath())); + FileUtil.del(Paths.get(themeProperty.getThemePath())); // Delete theme cache cacheStore.delete(THEMES_CACHE_KEY); - } catch (IOException e) { + } catch (Exception e) { throw new ServiceException("Failed to delete theme folder", e).setErrorData(themeId); } } @@ -351,6 +351,8 @@ public class ThemeServiceImpl implements ThemeService { // Delete theme package FileUtil.del(uploadPath.toFile()); + cacheStore.delete(THEMES_CACHE_KEY); + return getProperty(Paths.get(workDir.toString(), originalBasename)); } catch (IOException e) { log.error("Failed to upload theme to local: " + uploadPath, e);