git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/SafeDeleteRecursive.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/SafeDeleteRecursive.java
index a3593eae9ed92bfe441b7acf29974875be71c53b..527a469f9b93cc7cee4604dbd97479d84d70e276 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/SafeDeleteRecursive.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/SafeDeleteRecursive.java
@@ -306,8 +306,12 @@ public class SafeDeleteRecursive extends JobStep implements FileVisitor<Path> {
                        }\r
                }\r
 \r
-               boolean canDelete = !noMDExists && catchedExists && killdateExists && mcArchived && tsmArchived\r
-                               && metadataEquals;\r
+//             boolean canDelete = !noMDExists && catchedExists && killdateExists && mcArchived && tsmArchived\r
+//                             && metadataEquals;\r
+\r
+               boolean canDelete = mcArchived && tsmArchived && metadataEquals && sizeEquals && mediaInfoAvailable;\r
+               logger.info(getSessionMarker(), canDelete);\r
+\r
                Date now = new Date(System.currentTimeMillis());\r
                logger.info(csvMarker, "{};{};{};{};{};{};{};{};{};{};{};{};{};{};{};{};{};{};{};", D(now), fileName,\r
                                mediaPath.getParent(), size, D(createDate), D(lastModifiedDate), D(mcArchivedDate), D(tsmBackupDate),\r
@@ -318,8 +322,8 @@ public class SafeDeleteRecursive extends JobStep implements FileVisitor<Path> {
                                YN(killdateExists), YN(noMDExists), YN(mcArchived), YN(tsmArchived), YN(metadataEquals), YN(sizeEquals),\r
                                YN(includeContains), YN(mediaInfoAvailable));\r
 \r
-//             if (canDelete)\r
-//                     removeFiles(mediaPath, killDateFiles);\r
+               if (canDelete)\r
+                       removeFiles(mediaPath, killDateFiles);\r
 \r
                return true;\r
        }\r