svn commit: r1859673 - in /uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state: DuccWorkIdFactory.java OrchestratorStateDb.java

[degenaro]

Author: degenaro
Date: Tue May 21 19:23:13 2019
New Revision: 1859673

URL: http://svn.apache.org/viewvc?rev=1859673&view=rev
Log:
UIMA-6049 DUCC Orchestrator (OR) may give out duplicate ID numbers

Modified:
    
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/DuccWorkIdFactory.java
    
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/OrchestratorStateDb.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/DuccWorkIdFactory.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/DuccWorkIdFactory.java?rev=1859673&r1=1859672&r2=1859673&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/DuccWorkIdFactory.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/DuccWorkIdFactory.java
 Tue May 21 19:23:13 2019
@@ -27,7 +27,7 @@ public class DuccWorkIdFactory implement
        private static IOrchestratorState orchestratorState = 
OrchestratorState.getInstance();
        
        @Override
-       public DuccId next() {
+       public synchronized DuccId next() {
                long value = orchestratorState.getNextDuccWorkSequenceNumber();
                return new DuccId(value);
        }

Modified: 
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/OrchestratorStateDb.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/OrchestratorStateDb.java?rev=1859673&r1=1859672&r2=1859673&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/OrchestratorStateDb.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/OrchestratorStateDb.java
 Tue May 21 19:23:13 2019
@@ -76,7 +76,7 @@ public class OrchestratorStateDb impleme
        }
 
        @Override
-       public long getNextDuccWorkSequenceNumber() {
+       public synchronized long getNextDuccWorkSequenceNumber() {
                long prev = orDbOrchestratorProperties.getDuccWorkSeqNo();
                long next = prev+1;
                orDbOrchestratorProperties.setDuccWorkSeqNo(next);