Shinsuke Sugaya 6 lat temu
rodzic
commit
6f9a464d09

+ 6 - 6
src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java

@@ -136,8 +136,8 @@ public class AdminBackupAction extends FessAdminAction {
                 } catch (final IOException e) {
                 } catch (final IOException e) {
                     logger.warn("Failed to process system.properties file: " + fileName, e);
                     logger.warn("Failed to process system.properties file: " + fileName, e);
                 } finally {
                 } finally {
-                    if (tempFile != null) {
-                        tempFile.delete();
+                    if (tempFile != null && !tempFile.delete()) {
+                        logger.warn("Failed to delete " + tempFile.getAbsolutePath());
                     }
                     }
                 }
                 }
             } else if (fileName.startsWith("gsa") && fileName.endsWith(".xml")) {
             } else if (fileName.startsWith("gsa") && fileName.endsWith(".xml")) {
@@ -147,8 +147,8 @@ public class AdminBackupAction extends FessAdminAction {
                 } catch (final IOException e) {
                 } catch (final IOException e) {
                     logger.warn("Failed to process gsa.xml file: " + fileName, e);
                     logger.warn("Failed to process gsa.xml file: " + fileName, e);
                 } finally {
                 } finally {
-                    if (tempFile != null) {
-                        tempFile.delete();
+                    if (tempFile != null && !tempFile.delete()) {
+                        logger.warn("Failed to delete " + tempFile.getAbsolutePath());
                     }
                     }
                 }
                 }
                 configParser.getWebConfig().ifPresent(c -> webConfigBhv.insert(c));
                 configParser.getWebConfig().ifPresent(c -> webConfigBhv.insert(c));
@@ -198,8 +198,8 @@ public class AdminBackupAction extends FessAdminAction {
                 } catch (final Exception e) {
                 } catch (final Exception e) {
                     logger.warn("Failed to process bulk file: " + fileName, e);
                     logger.warn("Failed to process bulk file: " + fileName, e);
                 } finally {
                 } finally {
-                    if (tempFile != null) {
-                        tempFile.delete();
+                    if (tempFile != null && !tempFile.delete()) {
+                        logger.warn("Failed to delete " + tempFile.getAbsolutePath());
                     }
                     }
                 }
                 }
             }
             }