fixing minor bug in the condition check
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/231e0eba Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/231e0eba Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/231e0eba Branch: refs/heads/develop Commit: 231e0eba64ec2e7c5d59dc5afac0d8ae1f953c89 Parents: b774862 Author: scnakandala <[email protected]> Authored: Mon Mar 6 13:38:38 2017 -0500 Committer: scnakandala <[email protected]> Committed: Tue Mar 7 17:14:59 2017 -0500 ---------------------------------------------------------------------- .../apache/airavata/gfac/monitor/email/EmailBasedMonitor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/231e0eba/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java index 92f0d78..9db1b84 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java @@ -280,8 +280,8 @@ public class EmailBasedMonitor implements JobMonitor, Runnable{ process(jobStatusResult, taskContext); processedMessages.add(message); - } else if (addressMap.get(message.getFrom()).equals(ResourceJobManagerType.AIRAVATA_CUSTOM) - && (new Date()).getTime() - message.getSentDate().getTime() > 1000 * 6 * 5) { + } else if (!jobStatusResult.isAuthoritative() + && (new Date()).getTime() - message.getSentDate().getTime() > 1000 * 60 * 5) { //marking old custom Airavata emails as read processedMessages.add(message); log.info("Marking old Airavata custom emails as read, message subject --> {}", message.getSubject());
