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 2017/01/30 13:58:34 UTC
svn commit: r1780912 -
/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java
Author: degenaro
Date: Mon Jan 30 13:58:34 2017
New Revision: 1780912
URL: http://svn.apache.org/viewvc?rev=1780912&view=rev
Log:
UIMA-5279 DUCC Web Server (WS) may show incorrect values for PgIn and Swap on mixed cgroup cluster
Modified:
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java?rev=1780912&r1=1780911&r2=1780912&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java Mon Jan 30 13:58:34 2017
@@ -458,7 +458,10 @@ public class DuccWorkJob extends ADuccWo
// choose the smallest negative value, else return the sum
private long merge(long jd, long jp) {
long retVal = 0;
- if((jd < 0) && (jp < 0)) {
+ if((jd >= 0) && (jp >= 0)) {
+ retVal = jd+jp;
+ }
+ else {
if(jd < jp) {
retVal = jd;
}
@@ -466,22 +469,16 @@ public class DuccWorkJob extends ADuccWo
retVal = jp;
}
}
- else if(jd < 0) {
- retVal = jd;
- }
- else if(jp < 0) {
- retVal = jp;
- }
- else {
- retVal = jd+jp;
- }
return retVal;
}
// choose the smallest negative value, else return the sum
private double merge(double jd, double jp) {
double retVal = 0;
- if((jd < 0) && (jp < 0)) {
+ if((jd >= 0) && (jp >= 0)) {
+ retVal = jd+jp;
+ }
+ else {
if(jd < jp) {
retVal = jd;
}
@@ -489,15 +486,6 @@ public class DuccWorkJob extends ADuccWo
retVal = jp;
}
}
- else if(jd < 0) {
- retVal = jd;
- }
- else if(jp < 0) {
- retVal = jp;
- }
- else {
- retVal = jd+jp;
- }
return retVal;
}