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/03/13 13:46:28 UTC
svn commit: r1666427 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
Author: degenaro
Date: Fri Mar 13 12:46:28 2015
New Revision: 1666427
URL: http://svn.apache.org/r1666427
Log:
UIMA-4284 DUCC Web Server (WS) displays 2 entries on the Machines page for the same machine?
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java?rev=1666427&r1=1666426&r2=1666427&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java Fri Mar 13 12:46:28 2015
@@ -457,7 +457,13 @@ public class MachineInfo implements Comp
}
*/
private int compareIp(MachineInfo m1, MachineInfo m2) {
- return m1.ip.compareTo(m2.ip);
+ int retVal = 0;
+ if(m1.ip.trim().length() > 0) {
+ if(m2.ip.trim().length() > 0) {
+ retVal = m1.ip.compareTo(m2.ip);
+ }
+ }
+ return retVal;
}
private int compareName(MachineInfo m1, MachineInfo m2) {