You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2013/12/11 22:36:58 UTC

svn commit: r1550276 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler: NodepoolScheduler.java RmJob.java

Author: challngr
Date: Wed Dec 11 21:36:57 2013
New Revision: 1550276

URL: http://svn.apache.org/r1550276
Log:
UIMA-3499 NodepoolScheduler.java: missing break; RmJob, Better check for Nan.  Updates found by findbugs.

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java?rev=1550276&r1=1550275&r2=1550276&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java Wed Dec 11 21:36:57 2013
@@ -906,6 +906,7 @@ public class NodepoolScheduler
                 switch ( rc.getPolicy()) {
                     case FAIR_SHARE:
                         fair_share_jobs.add(j);
+                        break;
                     case FIXED_SHARE:
                         fixed_share_jobs.add(j);
                         break;

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java?rev=1550276&r1=1550275&r2=1550276&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java Wed Dec 11 21:36:57 2013
@@ -960,7 +960,7 @@ public class RmJob
 
         int answer = 0;
 
-        if ( init_wait || (time_per_item == Double.NaN) ) {   // no cap if not initialized, or no per-itme time yet
+        if ( init_wait || Double.isNaN(time_per_item) ) {   // no cap if not initialized, or no per-itme time yet
             // (We could exit sooner but for debugging purposes we very much want that log statement just above even
             //  if there's some junk in it.)
             answer = Integer.MAX_VALUE;