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 DD3451081C for ; Tue, 11 Feb 2014 14:56:50 +0000 (UTC) Received: (qmail 17281 invoked by uid 500); 11 Feb 2014 14:56:49 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 17211 invoked by uid 500); 11 Feb 2014 14:56:43 -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 17197 invoked by uid 99); 11 Feb 2014 14:56:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Feb 2014 14:56:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 89EB8923C15; Tue, 11 Feb 2014 14:56:41 +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: X-Mailer: ASF-Git Admin Mailer Subject: git commit: fixing erroneous return type - AIRAVATA-1006 Date: Tue, 11 Feb 2014 14:56:41 +0000 (UTC) Updated Branches: refs/heads/master e4a12c345 -> 1d0dadadf fixing erroneous return type - AIRAVATA-1006 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1d0dadad Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1d0dadad Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1d0dadad Branch: refs/heads/master Commit: 1d0dadadf5ffdf9c7bd88337c53269fd696aacd3 Parents: e4a12c3 Author: chathuri Authored: Tue Feb 11 09:56:31 2014 -0500 Committer: chathuri Committed: Tue Feb 11 09:56:31 2014 -0500 ---------------------------------------------------------------------- .../airavata/persistance/registry/jpa/impl/ExperimentRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/1d0dadad/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java index c88381d..5bdb42e 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java @@ -423,7 +423,7 @@ public class ExperimentRegistry { ExperimentMetadataResource exBasicData = (ExperimentMetadataResource) gateway.get(ResourceType.EXPERIMENT_METADATA, expId); ExperimentConfigDataResource exCongfig = (ExperimentConfigDataResource)exBasicData.get(ResourceType.EXPERIMENT_CONFIG_DATA, expId); if (fieldName == null){ - return exCongfig; + return ThriftDataModelConversion.getAdvanceInputDataHandling(exCongfig); }else if (fieldName.equals(Constants.FieldConstants.ConfigurationDataConstants.APPLICATION_ID)){ return exCongfig.getApplicationID(); }else if (fieldName.equals(Constants.FieldConstants.ConfigurationDataConstants.APPLICATION_VERSION)){