svn commit: r1697733 - in /uima/sandbox/uima-ducc/trunk: uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java

[challngr]

Author: challngr
Date: Tue Aug 25 16:49:56 2015
New Revision: 1697733

URL: http://svn.apache.org/r1697733
Log:
UIMA-4569 RM should report allocations in GB instead of shares - eliminate 
warnings in eclipse.

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java
    
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java?rev=1697733&r1=1697732&r2=1697733&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java
 Tue Aug 25 16:49:56 2015
@@ -654,7 +654,7 @@ public class NodeConfiguration
                 props.setProperty("share-quantum", 
""+SystemPropertyResolver.getIntProperty("ducc.rm.share.quantum", 15));
             } else {
                 try {
-                    int quantum = Integer.parseInt(q);
+                                       Integer.parseInt(q);      // insure 
it's a number
                 } catch (NumberFormatException e) {
                     throw new IllegalConfigurationException("Value for 
\"share-quantum\" in nodepool " + props.getProperty("name") + " is not a 
number.");
                 }

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java?rev=1697733&r1=1697732&r2=1697733&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
 Tue Aug 25 16:49:56 2015
@@ -741,11 +741,6 @@ class NodePool
        String methodName = "rearrangeVirtual";
         if ( allMachines.containsKey(m.key()) ) {
             int v_order = m.getVirtualShareOrder();
-            
-            if ( v_order < 0 ) {
-               int stop_here = 1;
-               stop_here++;
-            }
             int r_order = m.getShareOrder();
 
             logger.trace(methodName, null, m.getId(), "order", order, 
"v_order", v_order, "r_order", r_order);