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

diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/ForkUploadStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/ForkUploadStep.java
index 66672ed8cf35c5d8f0463d81342df0827f2cc22b..df1707a6ae8f2703a598cb759becaa58a0de9649 100644 (file)
--- a/server/user.jobengine.executors/amc/user/jobengine/server/steps/ForkUploadStep.java
+++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/ForkUploadStep.java
@@ -68,16 +68,19 @@ public class ForkUploadStep extends JobStep {
                        //                      });\r
 \r
                        //200911 megis inkabb a letrehozas idopontja legyen\r
-                       escortFiles.sort((p1, p2) -> {\r
-                               int result = 0;\r
-                               try {\r
-                                       FileTime mod1 = Files.readAttributes(p1, BasicFileAttributes.class).lastModifiedTime();\r
-                                       FileTime mod2 = Files.readAttributes(p2, BasicFileAttributes.class).lastModifiedTime();\r
-                                       result = mod1.compareTo(mod2);\r
-                               } catch (Exception e) {\r
-                               }\r
-                               return result;\r
-                       });\r
+                       try {\r
+                               escortFiles.sort((p1, p2) -> {\r
+                                       int result = 0;\r
+                                       try {\r
+                                               FileTime mod1 = Files.readAttributes(p1, BasicFileAttributes.class).lastModifiedTime();\r
+                                               FileTime mod2 = Files.readAttributes(p2, BasicFileAttributes.class).lastModifiedTime();\r
+                                               result = mod1.compareTo(mod2);\r
+                                       } catch (Throwable e) {\r
+                                       }\r
+                                       return result;\r
+                               });\r
+                       } catch (Throwable e) {\r
+                       }\r
 \r
                        if (allCount > 0) {\r
                                for (Path escortFile : escortFiles) {\r
@@ -201,6 +204,10 @@ public class ForkUploadStep extends JobStep {
 \r
                        //parameterek: IJobRuntime parent, String template, String name, int priority, Map<String, Object> parameters\r
                        IJobRuntime child = getEngine().submit(null, e -> {\r
+                               IJobRuntime r = (IJobRuntime) e.getSource();\r
+                               if (r.isDisableRetry())\r
+                                       return;\r
+\r
                                if (e.getStatus().equals(JobStatus.CANCELED) || e.getStatus().equals(JobStatus.SUSPENDED))\r
                                        EscortFiles.removeCatchedFile(escortFile);\r
                        }, template, "Visszatöltés", priority, IJobEngine.DEFAULT_OWNER, parameters);\r