You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by he...@apache.org on 2012/03/05 21:28:42 UTC
svn commit: r1297219 -
/incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java
Author: heshan
Date: Mon Mar 5 20:28:42 2012
New Revision: 1297219
URL: http://svn.apache.org/viewvc?rev=1297219&view=rev
Log:
Fixing NPE
Modified:
incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java
Modified: incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java?rev=1297219&r1=1297218&r2=1297219&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java (original)
+++ incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java Mon Mar 5 20:28:42 2012
@@ -179,9 +179,15 @@ public class MigrationUtil {
gram.setJobType(getJobTypeEnum(appBean.getJobType()));
// TODO : verify the following
- ProjectAccountType projectAccount = gram.getProjectAccount();
+ ProjectAccountType projectAccount;
+ if(gram.getProjectAccount() != null) {
+ projectAccount = gram.getProjectAccount();
+ } else {
+ projectAccount = gram.addNewProjectAccount();
+ }
projectAccount.setProjectAccountNumber(appBean.getProjectName());
projectAccount.setProjectAccountDescription(appBean.getPcount().toString());
+
QueueType queueName = gram.getQueue();
queueName.setQueueName(appBean.getQueue());