Author: degenaro
Date: Tue May 17 12:57:21 2016
New Revision: 1744258
URL: http://svn.apache.org/viewvc?rev=1744258&view=rev
Log:
UIMA-4923 DUCC Web Server (WS) should not display nodes that have been removed
from service on Machines page
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=1744258&r1=1744257&r2=1744258&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
Tue May 17 12:57:21 2016
@@ -77,8 +77,6 @@ public class DuccMachinesData {
private static MachineFactsList machineFactsList = new
MachineFactsList();
- private static DbQuery dbQuery = DbQuery.getInstance();
-
public static DuccMachinesData getInstance() {
return duccMachinesData;
}
@@ -482,6 +480,7 @@ public class DuccMachinesData {
// Working map used to generate the returnable
ConcurrentSkipListMap<MachineInfo,NodeId> dbSortedMachines =
new ConcurrentSkipListMap<MachineInfo,NodeId>();
// Get map from DB courtesy of RM
+ DbQuery dbQuery = DbQuery.getInstance();
Map<String, IDbMachine> dbMapMachines =
dbQuery.getMapMachines();
// Working list of known machines, by short name
List<String> knownShortNames = new ArrayList<String>();