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 380399931 for ; Tue, 21 May 2013 14:55:47 +0000 (UTC) Received: (qmail 94348 invoked by uid 500); 21 May 2013 14:55:47 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 94280 invoked by uid 500); 21 May 2013 14:55:46 -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 94267 invoked by uid 99); 21 May 2013 14:55:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 May 2013 14:55:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 May 2013 14:55:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7485523889E3; Tue, 21 May 2013 14:55:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1484828 - /airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java Date: Tue, 21 May 2013 14:55:22 -0000 To: commits@airavata.apache.org From: chathuri@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130521145522.7485523889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chathuri Date: Tue May 21 14:55:22 2013 New Revision: 1484828 URL: http://svn.apache.org/r1484828 Log: fixing error data not retrieving issue Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1484828&r1=1484827&r2=1484828&view=diff ============================================================================== --- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java (original) +++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java Tue May 21 14:55:22 2013 @@ -1979,7 +1979,7 @@ public class AiravataJPARegistry extends return provenanceRegistry.getExperimentExecutionErrors(experimentId); } List result=new ArrayList(); - List executionErrors = jpa.getWorker().getExperiment(experimentId).getData().getExecutionErrors(Source.GFAC.toString(), experimentId, null, null, null); + List executionErrors = jpa.getWorker().getExperiment(experimentId).getData().getExecutionErrors(Source.EXPERIMENT.toString(), experimentId, null, null, null); for (ExecutionErrorResource errorResource : executionErrors) { ExperimentExecutionError error = new ExperimentExecutionError(); setupValues(errorResource, error); @@ -1997,7 +1997,7 @@ public class AiravataJPARegistry extends return provenanceRegistry.getWorkflowExecutionErrors(experimentId, workflowInstanceId); } List result=new ArrayList(); - List executionErrors = jpa.getWorker().getExperiment(experimentId).getData().getExecutionErrors(Source.GFAC.toString(), experimentId, workflowInstanceId, null, null); + List executionErrors = jpa.getWorker().getExperiment(experimentId).getData().getExecutionErrors(Source.WORKFLOW.toString(), experimentId, workflowInstanceId, null, null); for (ExecutionErrorResource errorResource : executionErrors) { WorkflowExecutionError error = new WorkflowExecutionError(); setupValues(errorResource, error); @@ -2015,7 +2015,7 @@ public class AiravataJPARegistry extends return provenanceRegistry.getNodeExecutionErrors(experimentId, workflowInstanceId, nodeId); } List result=new ArrayList(); - List executionErrors = jpa.getWorker().getExperiment(experimentId).getData().getExecutionErrors(Source.GFAC.toString(), experimentId, workflowInstanceId, nodeId, null); + List executionErrors = jpa.getWorker().getExperiment(experimentId).getData().getExecutionErrors(Source.NODE.toString(), experimentId, workflowInstanceId, nodeId, null); for (ExecutionErrorResource errorResource : executionErrors) { NodeExecutionError error = new NodeExecutionError(); setupValues(errorResource, error); @@ -2168,7 +2168,7 @@ public class AiravataJPARegistry extends if (provenanceRegistry != null){ return provenanceRegistry.addNodeExecutionError(error); } - ExecutionErrorResource executionError = createNewExecutionErrorResource(error.getExperimentId(),error,ExecutionErrors.Source.WORKFLOW); + ExecutionErrorResource executionError = createNewExecutionErrorResource(error.getExperimentId(),error, Source.NODE); executionError.setWorkflowDataResource(jpa.getWorker().getExperiment(error.getExperimentId()).getData().getWorkflowInstance(error.getWorkflowInstanceId())); executionError.setNodeID(error.getNodeId()); executionError.save(); @@ -2181,7 +2181,7 @@ public class AiravataJPARegistry extends if (provenanceRegistry != null){ return provenanceRegistry.addGFacJobExecutionError(error); } - ExecutionErrorResource executionError = createNewExecutionErrorResource(error.getExperimentId(),error,ExecutionErrors.Source.WORKFLOW); + ExecutionErrorResource executionError = createNewExecutionErrorResource(error.getExperimentId(),error, Source.GFAC); executionError.setWorkflowDataResource(jpa.getWorker().getExperiment(error.getExperimentId()).getData().getWorkflowInstance(error.getWorkflowInstanceId())); executionError.setNodeID(error.getNodeId()); executionError.setGfacJobID(error.getGfacJobId());