Author: burn
Date: Fri May 2 21:24:07 2014
New Revision: 1592041
URL: http://svn.apache.org/r1592041
Log:
UIMA-3796 - OR accepts cancel requests from the user that launched it even if
not listed as an administrator
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1592041&r1=1592040&r2=1592041&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
Fri May 2 21:24:07 2014
@@ -549,7 +549,13 @@ implements Orchestrator {
retVal = true;
}
else {
- logger.info(methodName, duccId,
reqUser+" is not "+SpecificationProperties.key_role_administrator);
+ // JIRA 3796 - assume this and
other daemons are administrators
+ if
(reqUser.equals(System.getProperty("user.name"))) {
+ logger.info(methodName, duccId,
reqUser+" is "+SpecificationProperties.key_role_administrator + "
(implicitly}");
+ retVal = true;
+ } else {
+ logger.info(methodName, duccId,
reqUser+" is not "+SpecificationProperties.key_role_administrator);
+ }
}
}
else {
