You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/05/22 16:19:12 UTC

[02/12] airavata git commit: fixing minor bug in the condition check

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/a749a7c8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a749a7c8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a749a7c8

Branch: refs/heads/develop
Commit: a749a7c8d5fd010deb138ea009ce2bbed2d965d7
Parents: 56fefc9
Author: scnakandala <su...@gmail.com>
Authored: Mon Mar 6 13:38:38 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Mar 6 13:38:38 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/a749a7c8/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());