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/04/17 20:08:35 UTC
svn commit: r1469014 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
Author: degenaro
Date: Wed Apr 17 18:08:34 2013
New Revision: 1469014
URL: http://svn.apache.org/r1469014
Log:
UIMA-2816 DUCC orchestrator (OR) must reject submission when Crypto error occurs
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=1469014&r1=1469013&r2=1469014&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 Wed Apr 17 18:08:34 2013
@@ -501,7 +501,7 @@ implements Orchestrator {
}
private boolean isSignatureInvalid(Properties properties) {
String methodName = "isSignatureInvalid";
- boolean retVal = false;
+ boolean retVal = true;
try {
if(orchestratorCommonArea.isSignatureRequired()) {
String user = properties.getProperty(SpecificationProperties.key_user);
@@ -514,13 +514,13 @@ implements Orchestrator {
}
Crypto crypto = new Crypto(userHome,AccessType.READER);
String signature = (String)crypto.decrypt((byte[])properties.get(SpecificationProperties.key_signature));
- if(!user.equals(signature)) {
+ retVal = !user.equals(signature);
+ if(retVal) {
logger.warn(methodName, null, "user:"+user+" signature:"+signature+" valid:n");
}
else {
logger.debug(methodName, null, "user:"+user+" signature:"+signature+" valid:y");
}
- retVal = !user.equals(signature);
}
}
catch(Throwable t) {