airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] 03/04: Validating port value before overriding
Date Thu, 18 Jan 2018 19:22:26 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 53888e12f9177d99b17194581f04b3f691305cc8
Author: dimuthu.upeksha2@gmail.com <Dimu@1234>
AuthorDate: Wed Jan 17 15:34:29 2018 -0500

    Validating port value before overriding
---
 .../airavata/gfac/core/context/ProcessContext.java      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
index 3f45ff4..2dad12b 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
@@ -639,11 +639,18 @@ public class ProcessContext {
 					String hostName = !(alternateHostName == null || alternateHostName.length() == 0) ?
alternateHostName :
 								getComputeResourceDescription().getHostName();
 
-					return new ServerInfo(
-							getComputeResourceLoginUserName(),
-							hostName,
-							getComputeResourceCredentialToken(),
-							sshJobSubmission.getSshPort());
+					if (sshJobSubmission.getSshPort() > 0) {
+                        return new ServerInfo(
+                                getComputeResourceLoginUserName(),
+                                hostName,
+                                getComputeResourceCredentialToken(),
+                                sshJobSubmission.getSshPort());
+                    } else {
+                        return new ServerInfo(
+                                getComputeResourceLoginUserName(),
+                                hostName,
+                                getComputeResourceCredentialToken());
+                    }
 
 				} catch (AppCatalogException e) {
 					throw new GFacException("Failed to fetch ssh job submission for interface " +

-- 
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <commits@airavata.apache.org>.

Mime
View raw message