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 2015/09/28 14:39:53 UTC
svn commit: r1705676 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java
Author: degenaro
Date: Mon Sep 28 12:39:53 2015
New Revision: 1705676
URL: http://svn.apache.org/viewvc?rev=1705676&view=rev
Log:
UIMA-4606 Webserver (WS) needlessly polls history
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java?rev=1705676&r1=1705675&r2=1705676&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java Mon Sep 28 12:39:53 2015
@@ -94,34 +94,40 @@ public class DuccData {
}
}
+ //<UIMA-4606>
+ private boolean merge = false;
+ //</UIMA-4606>
+
@SuppressWarnings("unchecked")
private void mergeHistory(IDuccWorkMap map)
{
String methodName = "mergeHistory";
- Iterator<DuccId> iterator = duccWorkLive.keySet().iterator();
- while(iterator.hasNext()) {
- DuccId duccId = iterator.next();
- IDuccWork duccWork = duccWorkLive.findDuccWork(duccId);
- IDuccWork history = null;
- try {
- switch(duccWork.getDuccType()) {
- case Job:
- history = hpm.restoreJob(duccId.getFriendly());
- break;
- case Reservation:
- history = hpm.restoreReservation(duccId.getFriendly());
- break;
- case Service:
- history = hpm.restoreService(duccId.getFriendly());
- break;
- }
- if(history != null) {
- map.put(duccId, history);
+ if(merge) {
+ Iterator<DuccId> iterator = duccWorkLive.keySet().iterator();
+ while(iterator.hasNext()) {
+ DuccId duccId = iterator.next();
+ IDuccWork duccWork = duccWorkLive.findDuccWork(duccId);
+ IDuccWork history = null;
+ try {
+ switch(duccWork.getDuccType()) {
+ case Job:
+ history = hpm.restoreJob(duccId.getFriendly());
+ break;
+ case Reservation:
+ history = hpm.restoreReservation(duccId.getFriendly());
+ break;
+ case Service:
+ history = hpm.restoreService(duccId.getFriendly());
+ break;
+ }
+ if(history != null) {
+ map.put(duccId, history);
+ }
+ } catch ( Exception e ) {
+ logger.warn(methodName, duccId, "Cannot recover", duccWork.getDuccType(), "from history.");
}
- } catch ( Exception e ) {
- logger.warn(methodName, duccId, "Cannot recover", duccWork.getDuccType(), "from history.");
- }
- }
+ }
+ }
}
public void put(IDuccWorkMap map) {