You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/10/21 15:11:14 UTC
svn commit: r1187325 - in /incubator/airavata/trunk/modules/gfac-core/src:
main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java
test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
Author: lahiru
Date: Fri Oct 21 13:11:14 2011
New Revision: 1187325
URL: http://svn.apache.org/viewvc?rev=1187325&view=rev
Log:
Applying the patch for the issue AIRAVATA-154
Thanks Heshan for the contribution
Modified:
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java
incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java?rev=1187325&r1=1187324&r2=1187325&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java Fri Oct 21 13:11:14 2011
@@ -138,7 +138,7 @@ public class LocalProvider extends Abstr
nv.put(key,value);
}
- if(app.getEnv() != null){
+ if((app.getEnv() != null) && (app.getEnv().getEntryArray().length != 0)){
builder.environment().putAll(nv);
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java?rev=1187325&r1=1187324&r2=1187325&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java Fri Oct 21 13:11:14 2011
@@ -21,28 +21,27 @@
package org.apache.airavata.core.gfac.services.impl;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.Parameter;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
import org.apache.airavata.commons.gfac.type.parameter.AbstractParameter;
import org.apache.airavata.commons.gfac.type.parameter.ParameterFactory;
-import org.apache.airavata.commons.gfac.type.parameter.StringParameter;
import org.apache.airavata.core.gfac.context.invocation.impl.DefaultExecutionContext;
import org.apache.airavata.core.gfac.context.invocation.impl.DefaultInvocationContext;
import org.apache.airavata.core.gfac.context.message.impl.ParameterContextImpl;
import org.apache.airavata.core.gfac.notification.impl.LoggingNotification;
import org.apache.airavata.registry.api.impl.JCRRegistry;
+import org.apache.airavata.schemas.gfac.ShellApplicationDeploymentType;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.fail;
+
public class PropertiesBasedServiceImplTest {
@Before
public void setUp() throws Exception {
@@ -72,7 +71,7 @@ public class PropertiesBasedServiceImplT
app.setOutputDir("/tmp/output");
app.setStdOut("/tmp/echo.stdout");
app.setStdErr("/tmp/echo.stdout");
- app.setEnv(new HashMap<String, String>());
+ app.setEnv(ShellApplicationDeploymentType.Factory.newInstance().getEnv());
/*
* Service