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/04/17 14:57:26 UTC
svn commit: r1674293 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
Author: degenaro
Date: Fri Apr 17 12:57:25 2015
New Revision: 1674293
URL: http://svn.apache.org/r1674293
Log:
UIMA-4293 DUCC Web Server (WS) Reservation drop-down sizes should be ordered.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java?rev=1674293&r1=1674292&r2=1674293&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java Fri Apr 17 12:57:25 2015
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.TreeMap;
+import java.util.TreeSet;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.atomic.AtomicLong;
@@ -602,7 +603,7 @@ public class DuccMachinesData {
public List<Long> getMachineSizes() {
String location = "getMachineSizes";
- ArrayList<Long> machineSizes = new ArrayList<Long>();
+ TreeSet<Long> machineSizes = new TreeSet<Long>();
ConcurrentSkipListMap<MachineInfo,String> sortedMachines = getSortedMachines();
Iterator<MachineInfo> iterator;
iterator = sortedMachines.keySet().iterator();
@@ -624,6 +625,7 @@ public class DuccMachinesData {
logger.trace(location, jobid, e);
}
}
- return machineSizes;
+ List<Long> list = new ArrayList<Long>(machineSizes);
+ return list;
}
}