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 15:47:08 UTC
svn commit: r1538634 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
Author: degenaro
Date: Mon Nov 4 14:47:07 2013
New Revision: 1538634
URL: http://svn.apache.org/r1538634
Log:
UIMA-3402 DUCC ducc.properties file clean-up [jd.jost]
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=1538634&r1=1538633&r2=1538634&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 Mon Nov 4 14:47:07 2013
@@ -271,6 +271,8 @@ implements Orchestrator {
StartType startType = getStartType(args);
logger.info(methodName, null, "##### "+startType+" #####");
boolean saveState = false;
+ DuccPropertiesResolver dpr = DuccPropertiesResolver.getInstance();
+ String jdHostClass = dpr.getCachedProperty(DuccPropertiesResolver.ducc_jd_host_class);
long t0 = System.currentTimeMillis();
synchronized(workMap) {
Iterator<IDuccWork> iterator = workMap.values().iterator();
@@ -301,13 +303,13 @@ implements Orchestrator {
saveState = true;
break;
case warm:
- if(commonConfiguration.jdHostClass.equals(reservation.getSchedulingInfo().getSchedulingClass())) {
+ if(jdHostClass.equals(reservation.getSchedulingInfo().getSchedulingClass())) {
cancel(reservation);
saveState = true;
}
break;
case hot:
- if(commonConfiguration.jdHostClass.equals(reservation.getSchedulingInfo().getSchedulingClass())) {
+ if(jdHostClass.equals(reservation.getSchedulingInfo().getSchedulingClass())) {
IDuccReservationMap map = reservation.getReservationMap();
Iterator<Entry<DuccId, IDuccReservation>> entries = map.entrySet().iterator();
while(entries.hasNext()) {