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

diff --git a/server/user.jobengine.executors/config/config-worker.xml b/server/user.jobengine.executors/config/config-worker.xml
index 438def00aec14749f4acfef589ac7eb233375ea8..c02f332dee4b891ad43cf4978b756addd760c71b 100644 (file)
--- a/server/user.jobengine.executors/config/config-worker.xml
+++ b/server/user.jobengine.executors/config/config-worker.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <executors>\r
-       <executor className="user.jobengine.server.steps.SyncSubtitlesStep" maxConcurrent="1" isRemote="true" />\r
+<!--   <executor className="user.jobengine.server.steps.SyncSubtitlesStep" maxConcurrent="1" isRemote="true" /> -->\r
+       <executor className="SyncSubtitlesStep.java" maxConcurrent="1" isRemote="true" />\r
        <executor className="CancelableStep.java" maxConcurrent="1" isRemote="true" />\r
        <executor className="FakeStep.java" maxConcurrent="1" />\r
        <executor className="NEXIOArchiveCheckerStep.java" maxConcurrent="1" />\r

diff --git a/server/user.jobengine.executors/jobtemplates/sync-subtitles.xml b/server/user.jobengine.executors/jobtemplates/sync-subtitles.xml
index 37e264831a931431e7a3f394e8ba2a099653fa4b..7fa2a023fbfe124cf8fa5f6ddd116a8a53b41829 100644 (file)
--- a/server/user.jobengine.executors/jobtemplates/sync-subtitles.xml
+++ b/server/user.jobengine.executors/jobtemplates/sync-subtitles.xml
@@ -7,7 +7,8 @@
                </parameters>\r
        </declarations>\r
        <commands>\r
-               <calljobstep type="user.jobengine.server.steps.SyncSubtitlesStep" weight="1" >\r
+<!--           <calljobstep type="user.jobengine.server.steps.SyncSubtitlesStep" weight="1" > -->\r
+               <calljobstep type="SyncSubtitlesStep.java" weight="1" >\r
                        <inputs>\r
                                <input>\r
                                        <parameter name="sourceStoreName" />\r

diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/AMCTests.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/AMCTests.java
index 72726c4e82be31ba72efe17c3ea72b48b5cf9cb6..33b20deafdd4a1f4ea634672cc1d32da90486ead 100644 (file)
--- a/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/AMCTests.java
+++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/AMCTests.java
@@ -336,6 +336,36 @@ public class AMCTests {
                CountDownLatch finishLatch = new CountDownLatch(1);
                IJobRuntime jobRuntime = null;
 
+               jobRuntime = jobEngine.submit(null, e -> {
+                       if (e.isRuntimeTerminated())
+                               finishLatch.countDown();
+               }, "sync-subtitles.xml", "Sync subtitles", jobParams);
+
+               if (jobRuntime != null)
+                       finishLatch.await();
+
+               jobEngine.shutdown();
+               assertEquals(JobStatus.FINISHED, jobRuntime.getStatus());
+       }
+
+       @Test
+       public void testSyncSubtitlesLocked() throws Exception {
+               jobEngine = new JobEngine();
+               jobEngine.startup();
+               jobEngine.bindItemManagerService(manager);
+
+               String sourceStoreName = "SUB-IN";
+               manager.ensureUri(sourceStoreName, "/SUB-IN", false, false, RemoteStoreProtocol.LOCAL);
+               String targetStoreName = "SUB-OUT";
+               manager.ensureUri(targetStoreName, "/SUB-OUT", false, false, RemoteStoreProtocol.LOCAL);
+
+               Map<String, Object> jobParams = new HashMap<>();
+               jobParams.put("sourceStoreName", sourceStoreName);
+               jobParams.put("targetStoreName", targetStoreName);
+
+               CountDownLatch finishLatch = new CountDownLatch(1);
+               IJobRuntime jobRuntime = null;
+
                try (RandomAccessFile reader = new RandomAccessFile("/SUB-IN/BUL/CCEM100323-01.stl", "rw")) {
                        FileLock lock = reader.getChannel().lock();