airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [1/2] airavata-php-gateway git commit: fixing AIRAVATA-1801
Date Tue, 20 Oct 2015 00:12:44 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master 6d0618eb0 -> 8ca399994


fixing AIRAVATA-1801


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

Branch: refs/heads/master
Commit: 28801f653b579c47a8f268102e62ba70c9b574d2
Parents: 1c2b59e
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Mon Oct 19 20:08:31 2015 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Mon Oct 19 20:11:38 2015 -0400

----------------------------------------------------------------------
 app/libraries/ExperimentUtilities.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/28801f65/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 783c3cc..0a160ce 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -6,6 +6,7 @@ use Airavata\API\Error\ExperimentNotFoundException;
 use Airavata\API\Error\InvalidRequestException;
 use Airavata\Facades\Airavata;
 use Airavata\Model\Application\Io\DataType;
+use Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription;
 use Airavata\Model\Application\Io\InputDataObjectType;
 use Airavata\Model\Scheduling\ComputationalResourceSchedulingModel;
 use Airavata\Model\Experiment\ExperimentModel;
@@ -662,7 +663,15 @@ class ExperimentUtilities
                 $expVal["computeResource"] = "";
             }
         }
-        $expVal["applicationInterface"] = AppUtilities::get_application_interface($experimentSummary->executionId);
+
+        try{
+            $expVal["applicationInterface"] = AppUtilities::get_application_interface($experimentSummary->executionId);
+        }catch (Exception $ex){
+            //Failed retrieving Application Interface (May be it's deleted) Fix for Airavata-1801
+            $expVal["applicationInterface"] = new ApplicationInterfaceDescription();
+            $expVal["applicationInterface"]->applicationName = substr($experimentSummary->executionId,
-8);
+        }
+
 
         switch ($experimentSummary->experimentStatus) {
             case 'CREATED':
@@ -721,7 +730,14 @@ class ExperimentUtilities
                 $expVal["computeResource"] = "";
             }
         }
-        $expVal["applicationInterface"] = AppUtilities::get_application_interface($experiment->executionId);
+
+        try{
+            $expVal["applicationInterface"] = AppUtilities::get_application_interface($experiment->executionId);
+        }catch (Exception $ex){
+            //Failed retrieving Application Interface (May be it's deleted) Fix for Airavata-1801
+            $expVal["applicationInterface"] = new ApplicationInterfaceDescription();
+            $expVal["applicationInterface"]->applicationName = substr($experiment->executionId,
-8);
+        }
 
 
         switch (ExperimentState::$__names[$experiment->experimentStatus->state]) {


Mime
View raw message