Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 258CB17359 for ; Fri, 7 Nov 2014 15:58:39 +0000 (UTC) Received: (qmail 48033 invoked by uid 500); 7 Nov 2014 15:58:38 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 47972 invoked by uid 500); 7 Nov 2014 15:58:38 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 47866 invoked by uid 99); 7 Nov 2014 15:58:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Nov 2014 15:58:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B472A989DDE; Fri, 7 Nov 2014 15:58:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chathuri@apache.org To: commits@airavata.apache.org Message-Id: <4618a2d978b54075a3c88caf5b06558f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata git commit: fixing class cast exception occured due to ActualParameter instance Date: Fri, 7 Nov 2014 15:58:37 +0000 (UTC) Repository: airavata Updated Branches: refs/heads/gfac_appcatalog_int f09c742b8 -> e54132907 fixing class cast exception occured due to ActualParameter instance Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e5413290 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e5413290 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e5413290 Branch: refs/heads/gfac_appcatalog_int Commit: e54132907b81eb0daf479ea0986f7ff7a9be0e58 Parents: f09c742 Author: chathuriw Authored: Fri Nov 7 10:58:02 2014 -0500 Committer: Chathuri Wimalasena Committed: Fri Nov 7 10:58:02 2014 -0500 ---------------------------------------------------------------------- .../gfac/gsissh/util/GFACGSISSHUtils.java | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e5413290/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java index 0a521b5..2adc013 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java @@ -45,6 +45,7 @@ import org.apache.airavata.gsi.ssh.api.job.JobManagerConfiguration; import org.apache.airavata.gsi.ssh.impl.PBSCluster; import org.apache.airavata.gsi.ssh.util.CommonUtils; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription; +import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface; import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol; import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission; @@ -185,23 +186,8 @@ public class GFACGSISSHUtils { Map inputs = input.getParameters(); Set keys = inputs.keySet(); for (String paramName : keys) { - ActualParameter actualParameter = (ActualParameter) inputs.get(paramName); - if ("URIArray".equals(actualParameter.getType().getType().toString()) || "StringArray".equals(actualParameter.getType().getType().toString()) - || "FileArray".equals(actualParameter.getType().getType().toString())) { - String[] values = null; - if (actualParameter.getType() instanceof URIArrayType) { - values = ((URIArrayType) actualParameter.getType()).getValueArray(); - } else if (actualParameter.getType() instanceof StringArrayType) { - values = ((StringArrayType) actualParameter.getType()).getValueArray(); - } else if (actualParameter.getType() instanceof FileArrayType) { - values = ((FileArrayType) actualParameter.getType()).getValueArray(); - } - String value = StringUtil.createDelimiteredString(values, " "); - inputValues.add(value); - } else { - String paramValue = MappingFactory.toString(actualParameter); - inputValues.add(paramValue); - } + InputDataObjectType inputDataObjectType = (InputDataObjectType) inputs.get(paramName); + inputValues.add(inputDataObjectType.getValue()); } jobDescriptor.setInputValues(inputValues);