Rekurziv archivalas sebessegenek novelese

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
index cee331ea7dff1b5c9fb9fef2beefb008a9668725..119f941e546b99f454dc524a75efd23d20981c18 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
@@ -257,17 +257,21 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
                        return true;\r
                }\r
 \r
-               if (handleArchiveConflict(mediaPath)) {\r
-                       logger.info(getSessionMarker(), "Skipping archive db already contains {}", mediaPath);\r
-                       return true;\r
-               }\r
-\r
                boolean includeContains = includeList.contains(mediaPath.toString());\r
                if (!includeContains) {\r
                        logger.info(getSessionMarker(), "Not on whitelist {}, skipping", mediaPath);\r
                        return true;\r
                }\r
 \r
+               Path nomdFile = Paths.get(mediaPath.toString() + ".nomd");\r
+               if (Files.exists(nomdFile))\r
+                       return true;\r
+\r
+               if (handleArchiveConflict(mediaPath)) {\r
+                       logger.info(getSessionMarker(), "Skipping archive db already contains {}", mediaPath);\r
+                       return true;\r
+               }\r
+\r
 //\r
 //             if (nomdFile.toFile().exists()) {\r
 //                     // toroljuk es ujbol letrehozzuk ha kell\r
@@ -296,7 +300,6 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 //                     logger.info(new MediaCubeMarker("vasary@elgekko.net,muszak@mediavivantis.hu",\r
 //                                     "Értesítés problémás " + mediaPath.getFileName().toString() + " archiválásról"), msg);\r
 \r
-                       Path nomdFile = Paths.get(mediaPath.toString() + ".nomd");\r
                        if (!Files.exists(nomdFile))\r
                                Files.createFile(nomdFile);\r
                        return true;\r