Author: burn
Date: Wed Sep 23 19:06:23 2015
New Revision: 1704915
URL: http://svn.apache.org/viewvc?rev=1704915&view=rev
Log:
UIMA-4564 merge revision 1697512 into the 2.0.1 branch
Modified:
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java
(contents, props changed)
Modified:
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java?rev=1704915&r1=1704914&r2=1704915&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java
(original)
+++
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java
Wed Sep 23 19:06:23 2015
@@ -391,7 +391,7 @@ public abstract class DuccMonitor {
flag_cancel_on_interrupt.set(false);
message.append(details(monitorInfo));
}
- else if (state.equals(StateAssigned)) {
// A reservation has completed
+ else if (context == DuccContext.Reservation &&
state.equals(StateAssigned)) { // A reservation has completed
flag_cancel_on_interrupt.set(false);
message.append(details(monitorInfo));
}
@@ -427,7 +427,7 @@ public abstract class DuccMonitor {
}
}
}
- if (state.equals(StateAssigned)) {
+ if (context == DuccContext.Reservation &&
state.equals(StateAssigned)) {
if(monitorInfo.nodes != null) {
if(monitorInfo.nodes.size() >
0) {
StringBuffer sb = new
StringBuffer();
Propchange:
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Sep 23 19:06:23 2015
@@ -0,0 +1 @@
+/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java:1693975-1697512
