Return-Path: X-Original-To: apmail-incubator-airavata-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-airavata-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CEB1E928F for ; Wed, 25 Jan 2012 19:11:58 +0000 (UTC) Received: (qmail 91064 invoked by uid 500); 25 Jan 2012 19:11:58 -0000 Delivered-To: apmail-incubator-airavata-commits-archive@incubator.apache.org Received: (qmail 91018 invoked by uid 500); 25 Jan 2012 19:11:58 -0000 Mailing-List: contact airavata-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: airavata-dev@incubator.apache.org Delivered-To: mailing list airavata-commits@incubator.apache.org Received: (qmail 91006 invoked by uid 99); 25 Jan 2012 19:11:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jan 2012 19:11:57 +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; Wed, 25 Jan 2012 19:11:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3A0B623889E7; Wed, 25 Jan 2012 19:11:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1235878 - /incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java Date: Wed, 25 Jan 2012 19:11:34 -0000 To: airavata-commits@incubator.apache.org From: samindaw@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120125191134.3A0B623889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: samindaw Date: Wed Jan 25 19:11:33 2012 New Revision: 1235878 URL: http://svn.apache.org/viewvc?rev=1235878&view=rev Log: check property exist user, status, time for workflow execution Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java?rev=1235878&r1=1235877&r2=1235878&view=diff ============================================================================== --- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java (original) +++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java Wed Jan 25 19:11:33 2012 @@ -919,14 +919,22 @@ public class AiravataJCRRegistry extends try { session = getSession(); Node workflowDataNode = getWorkflowExperimentDataNode(experimentId, session); - ExecutionStatus status = ExecutionStatus.valueOf(workflowDataNode.getProperty(WORKFLOW_STATUS_PROPERTY).getString()); - Property prop = workflowDataNode.getProperty(WORKFLOW_STATUS_TIME_PROPERTY); - Date date=null; - if (prop!=null) { - Long dateMiliseconds = prop.getLong(); - Calendar cal = Calendar.getInstance(); - cal.setTimeInMillis(dateMiliseconds); - date = cal.getTime(); + ExecutionStatus status = null; + if (workflowDataNode.hasProperty(WORKFLOW_STATUS_PROPERTY)) { + status = ExecutionStatus.valueOf(workflowDataNode.getProperty( + WORKFLOW_STATUS_PROPERTY).getString()); + } + Date date = null; + if (workflowDataNode.hasProperty(WORKFLOW_STATUS_TIME_PROPERTY)) { + Property prop = workflowDataNode + .getProperty(WORKFLOW_STATUS_TIME_PROPERTY); + date = null; + if (prop != null) { + Long dateMiliseconds = prop.getLong(); + Calendar cal = Calendar.getInstance(); + cal.setTimeInMillis(dateMiliseconds); + date = cal.getTime(); + } } property=new WorkflowExecutionStatus(status, date); session.save(); @@ -1115,8 +1123,11 @@ public class AiravataJCRRegistry extends try { session = getSession(); Node workflowDataNode = getWorkflowExperimentDataNode(experimentId, session); - property = workflowDataNode.getProperty(WORKFLOW_USER_PROPERTY).getString(); - session.save(); + if (workflowDataNode.hasProperty(WORKFLOW_USER_PROPERTY)) { + property = workflowDataNode.getProperty(WORKFLOW_USER_PROPERTY) + .getString(); + } + session.save(); } catch (Exception e) { e.printStackTrace(); } finally { @@ -1202,8 +1213,11 @@ public class AiravataJCRRegistry extends try { session = getSession(); Node workflowDataNode = getWorkflowExperimentDataNode(experimentId, session); - property = workflowDataNode.getProperty(WORKFLOW_METADATA_PROPERTY).getString(); - session.save(); + if (workflowDataNode.hasProperty(WORKFLOW_METADATA_PROPERTY)) { + property = workflowDataNode.getProperty( + WORKFLOW_METADATA_PROPERTY).getString(); + } + session.save(); } catch (Exception e) { throw new RegistryException("Error while retrieving workflow metadata!!!", e); } finally {