airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1229275 - in /incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac: extension/data/RegistryDataService.java provider/utils/GramRSLGenerator.java
Date Mon, 09 Jan 2012 17:48:56 GMT
Author: lahiru
Date: Mon Jan  9 17:48:56 2012
New Revision: 1229275

URL: http://svn.apache.org/viewvc?rev=1229275&view=rev
Log:
fixing issues comes when executing workflow with description documents create using xbaya.

Modified:
    incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/data/RegistryDataService.java
    incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java

Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/data/RegistryDataService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/data/RegistryDataService.java?rev=1229275&r1=1229274&r2=1229275&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/data/RegistryDataService.java
(original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/data/RegistryDataService.java
Mon Jan  9 17:48:56 2012
@@ -70,21 +70,21 @@ public class RegistryDataService extends
             /*
              * Input and Output Directory
              */
-            if (appDesc.getInputDataDirectory() == null) {
+            if (appDesc.getInputDataDirectory() == null || "".equals(appDesc.getInputDataDirectory()))
{
                 appDesc.setInputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator
+ "inputData");
             }
-            if (appDesc.getOutputDataDirectory() == null) {
+            if (appDesc.getOutputDataDirectory() == null || "".equals(appDesc.getOutputDataDirectory()))
{
                 appDesc.setOutputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator
+ "outputData");
             }
 
             /*
              * Stdout and Stderr for Shell
              */
-            if (appDesc.getStandardOutput() == null) {
+            if (appDesc.getStandardOutput() == null || "".equals(appDesc.getStandardOutput()))
{
                 appDesc.setStandardOutput(appDesc.getStaticWorkingDirectory() + File.separator
                         + appDesc.getApplicationName().getStringValue() + ".stdout");
             }
-            if (appDesc.getStandardError() == null) {
+            if (appDesc.getStandardError() == null || "".equals(appDesc.getStandardError()))
{
                 appDesc.setStandardError(appDesc.getStaticWorkingDirectory() + File.separator
                         + appDesc.getApplicationName().getStringValue() + ".stderr");
             }

Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java?rev=1229275&r1=1229274&r2=1229275&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
(original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
Mon Jan  9 17:48:56 2012
@@ -104,9 +104,11 @@ public class GramRSLGenerator {
             log.info("Setting number of procs to " + app.getCpuCount());
             jobAttr.setNumProcs(app.getCpuCount());
         }
-        if (app.getProjectAccount().getProjectAccountNumber() != null) {
-            log.info("Setting project to " + app.getProjectAccount().getProjectAccountNumber());
-            jobAttr.setProject(app.getProjectAccount().getProjectAccountNumber());
+        if (app.getProjectAccount() != null) {
+            if (app.getProjectAccount().getProjectAccountNumber() != null) {
+                log.info("Setting project to " + app.getProjectAccount().getProjectAccountNumber());
+                jobAttr.setProject(app.getProjectAccount().getProjectAccountNumber());
+            }
         }
         if(app.getQueue() != null){
         if (app.getQueue().getQueueName() != null) {



Mime
View raw message