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

diff --git a/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java b/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java
index 4f2313b699995959230a260bb2a5ca7d5e107732..6c2e546727030f8ec2705b4cbd0ae4799fb326df 100644 (file)
--- a/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java
+++ b/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java
@@ -16,7 +16,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage;
 import user.commons.MediaCubeMarker;\r
 \r
 public class CalculateMD5Step extends JobStep {\r
-       private static final Logger logger = LogManager.getLogger();\r
+       private static final Logger logger = LogManager.getLogger(CalculateMD5Step.class);\r
 \r
        @StepEntry\r
        public Object[] execute(String fileName) throws Exception {\r
@@ -43,7 +43,7 @@ public class CalculateMD5Step extends JobStep {
                        while ((byteCount = dis.read(byteArray)) != -1) {\r
                                messageDigest.update(byteArray, 0, byteCount);\r
                                digest = messageDigest.digest();\r
-                               setProgress(50);\r
+                               setProgress(1);\r
                        }\r
                } catch (NoSuchAlgorithmException e) {\r
                        e.printStackTrace();\r
@@ -51,8 +51,8 @@ public class CalculateMD5Step extends JobStep {
                        dis.close();\r
                }\r
 \r
-               logger.info("digest= ", digest.toString());\r
-               logger.info("fileSize= ", fileSize);\r
+               logger.info("digest= {}", digest.toString());\r
+               logger.info("fileSize= {}", fileSize);\r
                return new Object[] { digest.toString() };\r
        }\r
 }
\ No newline at end of file

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java
index 4f987dfa96bf701ecd4f3dc1a1515e166006381c..bbf21dbc61593eb53e6a8dff3cc7b40ab8440676 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java
@@ -10,19 +10,15 @@ import java.security.NoSuchAlgorithmException;
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
-import org.apache.logging.log4j.message.Message;\r
-import org.apache.logging.log4j.message.ParameterizedMessage;\r
-\r
-import user.commons.MediaCubeMarker;\r
 \r
 public class CalculateMD5Step extends JobStep {\r
-       private static final Logger logger = LogManager.getLogger();\r
+       private static final Logger logger = LogManager.getLogger(CalculateMD5Step.class);\r
 \r
        @StepEntry\r
        public Object[] execute(String fileName) throws Exception {\r
                logger.info(getMarker(), "Executing");\r
-               Message msg = new ParameterizedMessage("");\r
-               logger.info(new MediaCubeMarker("vasary@elgekko.net,vasary@gmail.com", "MediaCube rendszerüzenet"), msg);\r
+//             Message msg = new ParameterizedMessage("");\r
+//             logger.info(new MediaCubeMarker("vasary@elgekko.net,vasary@gmail.com", "MediaCube rendszerüzenet"), msg);\r
 \r
                // getting file size\r
                Path fileToDigest = Paths.get(fileName);\r
@@ -45,11 +41,14 @@ public class CalculateMD5Step extends JobStep {
                                digest = messageDigest.digest();\r
                                setProgress(1);\r
                        }\r
-                       dis.close();\r
                } catch (NoSuchAlgorithmException e) {\r
                        e.printStackTrace();\r
+               } finally {\r
+                       dis.close();\r
                }\r
 \r
+               logger.info("digest= {}", digest.toString());\r
+               logger.info("fileSize= {}", fileSize);\r
                return new Object[] { digest.toString() };\r
        }\r
 }
\ No newline at end of file