Repository: airavata Updated Branches: refs/heads/master 2936cea04 -> 92ad9f122
fixing a issue with comparing two hosts, this will enable running one command per host for a given user to get status Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/92ad9f12 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/92ad9f12 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/92ad9f12 Branch: refs/heads/master Commit: 92ad9f12287a6cd8d712e63ad4a108a8655174b8 Parents: 2936cea Author: lahiru <[email protected]> Authored: Thu Sep 11 00:15:59 2014 -0400 Committer: lahiru <[email protected]> Committed: Thu Sep 11 00:15:59 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/gfac/monitor/util/CommonUtils.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/92ad9f12/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java index 27b213f..f8e4097 100644 --- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java +++ b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java @@ -89,7 +89,7 @@ public class CommonUtils { // then this is the right place to update List<HostMonitorData> monitorIDs = next.getHostMonitorData(); for (HostMonitorData host : monitorIDs) { - if (host.getHost().equals(monitorID.getHost())) { + if (host.getHost().toXML().equals(monitorID.getHost().toXML())) { // ok we found right place to add this monitorID host.addMonitorIDForHost(monitorID); return; @@ -135,7 +135,8 @@ public class CommonUtils { if(iHostMonitorID.getHost().equals(monitorID.getHost())) { List<MonitorID> monitorIDs = iHostMonitorID.getMonitorIDs(); for(MonitorID iMonitorID:monitorIDs){ - if(iMonitorID.getJobID().equals(monitorID.getJobID())) { + if(iMonitorID.getJobID().equals(monitorID.getJobID()) + || iMonitorID.getJobName().equals(monitorID.getJobName())) { // OK we found the object, we cannot do list.remove(object) states of two objects // could be different, thats why we check the jobID logger.info("Removing the job:"+ monitorID.getJobID()+" from monitoring last status:" + monitorID.getStatus().toString());
