airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject airavata git commit: Fixed email match issue with lonestar resource
Date Mon, 11 Jan 2016 16:07:55 GMT
Repository: airavata
Updated Branches:
  refs/heads/master c4861b09a -> cae7925b5


Fixed email match issue with lonestar resource


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cae7925b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cae7925b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cae7925b

Branch: refs/heads/master
Commit: cae7925b5d63e0abde7cb11b43edd5debf1701fd
Parents: c4861b0
Author: Shameera Rathnayaka <shameerainfo@gmail.com>
Authored: Mon Jan 11 11:05:17 2016 -0500
Committer: Shameera Rathnayaka <shameerainfo@gmail.com>
Committed: Mon Jan 11 11:07:14 2016 -0500

----------------------------------------------------------------------
 .../airavata/gfac/monitor/email/EmailBasedMonitor.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/cae7925b/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 c7a6875..9e802ae 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
@@ -170,10 +170,10 @@ public class EmailBasedMonitor implements JobMonitor, Runnable{
     private ResourceJobManagerType getJobMonitorType(String addressStr) throws AiravataException
{
 //        System.out.println("*********** address ******** : " + addressStr);
 	    for (Map.Entry<String, ResourceJobManagerType> addressEntry : addressMap.entrySet())
{
-		    if (addressEntry.getKey().matches(addressStr)) {
-			    return addressEntry.getValue();
-		    }
-	    }
+            if (addressStr.contains(addressEntry.getKey())) {
+                return addressEntry.getValue();
+            }
+        }
 	    throw new AiravataException("[EJM]: Couldn't identify Resource job manager type from
address " + addressStr);
     }
 


Mime
View raw message