Clear JShell directories during shutdown

[lgpl/argeo-commons.git] / org.argeo.cms.jshell / src / org / argeo / cms / jshell / CmsJShell.java

diff --git a/org.argeo.cms.jshell/src/org/argeo/cms/jshell/CmsJShell.java b/org.argeo.cms.jshell/src/org/argeo/cms/jshell/CmsJShell.java
index d9d7d799523fec81658e4c0fb71ca701adff5b3e..49283f420ec856f486e34f0026f25a23f6cea50e 100644 (file)
--- a/org.argeo.cms.jshell/src/org/argeo/cms/jshell/CmsJShell.java
+++ b/org.argeo.cms.jshell/src/org/argeo/cms/jshell/CmsJShell.java
@@ -178,12 +178,22 @@ public class CmsJShell {
                try {
                        Files.delete(jshLinkedDir);
                } catch (IOException e) {
-                       log.error("Cannot remove " + jshLinkedDir);
+                       log.error("Cannot remove " + jshLinkedDir, e);
+               }
+               try {
+                       FsUtils.delete(jshBase);
+               } catch (IOException e) {
+                       log.error("Cannot remove " + jshBase, e);
                }
                try {
                        Files.delete(jtermLinkedDir);
                } catch (IOException e) {
-                       log.error("Cannot remove " + jtermLinkedDir);
+                       log.error("Cannot remove " + jtermLinkedDir, e);
+               }
+               try {
+                       FsUtils.delete(jtermBase);
+               } catch (IOException e) {
+                       log.error("Cannot remove " + jtermBase, e);
                }
        }