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/04 20:38:45 UTC
svn commit: r1538731 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/MqReaper.java
Author: degenaro
Date: Mon Nov 4 19:38:45 2013
New Revision: 1538731
URL: http://svn.apache.org/r1538731
Log:
UIMA-3402 DUCC ducc.properties file clean-up [jd.host]
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/MqReaper.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/MqReaper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/MqReaper.java?rev=1538731&r1=1538730&r2=1538731&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/MqReaper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/MqReaper.java Mon Nov 4 19:38:45 2013
@@ -44,7 +44,6 @@ public class MqReaper {
private DuccPropertiesResolver duccPropertiesResolver = null;
private String jd_queue_prefix = null;
- private String jd_queue_prefix_default = "ducc.jd.queue.";
private static MqReaper instance = null;
@@ -89,7 +88,7 @@ public class MqReaper {
private void resolve() {
String location = "resolve";
- jd_queue_prefix = getDuccProperty(DuccPropertiesResolver.ducc_jd_queue_prefix, jd_queue_prefix_default);
+ jd_queue_prefix = getDuccProperty(DuccPropertiesResolver.ducc_jd_queue_prefix);
logger.info(location,duccId,DuccPropertiesResolver.ducc_jd_queue_prefix+":"+jd_queue_prefix);
}
@@ -97,20 +96,11 @@ public class MqReaper {
duccPropertiesResolver = DuccPropertiesHelper.configure();
}
- private String getDuccProperty(String key, String defaultValue) {
+ private String getDuccProperty(String key) {
if(duccPropertiesResolver == null) {
configure();
}
String value = duccPropertiesResolver.getFileProperty(key);
- if(value == null) {
- value = defaultValue;
- }
- else {
- value = value.trim();
- if(value.length() == 0) {
- value = defaultValue;
- }
- }
return value;
}