You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2013/11/07 14:23:24 UTC
svn commit: r1539630 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java
Author: degenaro
Date: Thu Nov 7 13:23:24 2013
New Revision: 1539630
URL: http://svn.apache.org/r1539630
Log:
UIMA-3414 OR will not create lock file unless ducc.orchestrator.use.lock.file = true in ducc.properties file
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java?rev=1539630&r1=1539629&r2=1539630&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java Thu Nov 7 13:23:24 2013
@@ -30,6 +30,7 @@ import org.apache.uima.ducc.common.persi
import org.apache.uima.ducc.common.utils.ComponentHelper;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
+import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.IDuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.common.utils.id.DuccIdFactory;
@@ -115,7 +116,13 @@ public class OrchestratorCommonArea {
}
private void init() {
- ComponentHelper.oneInstance(IDuccEnv.DUCC_STATE_DIR,"orchestrator");
+ // <Jira 3414>
+ DuccPropertiesResolver dpr = DuccPropertiesResolver.getInstance();
+ Boolean use_lock_file = new Boolean(dpr.getProperty(DuccPropertiesResolver.ducc_orchestrator_use_lock_file));
+ if(use_lock_file) {
+ ComponentHelper.oneInstance(IDuccEnv.DUCC_STATE_DIR,"orchestrator");
+ }
+ // </Jira 3414>
setPropertiesFileManager(new PropertiesFileManager(IDuccLoggerComponents.abbrv_orchestrator, IDuccEnv.DUCC_STATE_DIR, constOrchestratorProperties, false, true));
initSeqNo();
setDuccIdFactory(new DuccIdFactory(propertiesFileManager,constSeqNo));