From 33ef4c7c7a13802ef53dfc22e2c671ef46a76d2b Mon Sep 17 00:00:00 2001
From: "vasary.daniel" <TFS\vasary.daniel>
Date: Thu, 15 Apr 2021 12:32:11 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32210

---
 .../server/steps/ForkUploadStep.java          | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

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 66672ed8..df1707a6 100644
--- 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 {
 			//			});
 
 			//200911 megis inkabb a letrehozas idopontja legyen
-			escortFiles.sort((p1, p2) -> {
-				int result = 0;
-				try {
-					FileTime mod1 = Files.readAttributes(p1, BasicFileAttributes.class).lastModifiedTime();
-					FileTime mod2 = Files.readAttributes(p2, BasicFileAttributes.class).lastModifiedTime();
-					result = mod1.compareTo(mod2);
-				} catch (Exception e) {
-				}
-				return result;
-			});
+			try {
+				escortFiles.sort((p1, p2) -> {
+					int result = 0;
+					try {
+						FileTime mod1 = Files.readAttributes(p1, BasicFileAttributes.class).lastModifiedTime();
+						FileTime mod2 = Files.readAttributes(p2, BasicFileAttributes.class).lastModifiedTime();
+						result = mod1.compareTo(mod2);
+					} catch (Throwable e) {
+					}
+					return result;
+				});
+			} catch (Throwable e) {
+			}
 
 			if (allCount > 0) {
 				for (Path escortFile : escortFiles) {
@@ -201,6 +204,10 @@ public class ForkUploadStep extends JobStep {
 
 			//parameterek: IJobRuntime parent, String template, String name, int priority, Map<String, Object> parameters
 			IJobRuntime child = getEngine().submit(null, e -> {
+				IJobRuntime r = (IJobRuntime) e.getSource();
+				if (r.isDisableRetry())
+					return;
+
 				if (e.getStatus().equals(JobStatus.CANCELED) || e.getStatus().equals(JobStatus.SUSPENDED))
 					EscortFiles.removeCatchedFile(escortFile);
 			}, template, "Visszatöltés", priority, IJobEngine.DEFAULT_OWNER, parameters);
-- 
2.54.0