You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/08/14 15:38:54 UTC
[1/3] git commit: fixing build issue in tests
Repository: airavata
Updated Branches:
refs/heads/master 538e37f0e -> b19a8e06d
refs/heads/messaging_framework dcc647ebc -> 8a8a02b88
fixing build issue in tests
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/722de6d1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/722de6d1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/722de6d1
Branch: refs/heads/messaging_framework
Commit: 722de6d1fe5eea90bad2ccf9815e4cb28e633274
Parents: f29d7e6
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Mon Aug 11 15:44:15 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Mon Aug 11 15:44:15 2014 -0400
----------------------------------------------------------------------
.../airavata/gfac/local/provider/impl/LocalProvider.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/722de6d1/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
index 514f901..9672767 100644
--- a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
+++ b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
@@ -225,8 +225,10 @@ public class LocalProvider extends AbstractProvider {
Map<String, Object> output = jobExecutionContext.getOutMessageContext().getParameters();
OutputUtils.fillOutputFromStdout(output, stdOutStr, stdErrStr, outputArray);
TaskDetails taskDetails = (TaskDetails)registry.get(RegistryModelType.TASK_DETAIL, jobExecutionContext.getTaskData().getTaskID());
- taskDetails.setApplicationOutputs(outputArray);
- registry.update(RegistryModelType.TASK_DETAIL, taskDetails, taskDetails.getTaskID());
+ if (taskDetails != null){
+ taskDetails.setApplicationOutputs(outputArray);
+ registry.update(RegistryModelType.TASK_DETAIL, taskDetails, taskDetails.getTaskID());
+ }
registry.add(ChildDataType.EXPERIMENT_OUTPUT, outputArray, jobExecutionContext.getExperimentID());
MonitorID monitorId = createMonitorID(jobExecutionContext);
getMonitorPublisher().publish(new TaskOutputDataChangedEvent(new TaskIdentity(monitorId.getExperimentID(), monitorId.getWorkflowNodeID(), monitorId.getTaskID()), outputArray));
[2/3] git commit: Merge branch 'master' into messaging_framework
Posted by ch...@apache.org.
Merge branch 'master' into messaging_framework
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8a8a02b8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8a8a02b8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8a8a02b8
Branch: refs/heads/messaging_framework
Commit: 8a8a02b8814c75e8db1b069e2e7056cd8c3d0551
Parents: dcc647e 722de6d
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Mon Aug 11 15:44:51 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Mon Aug 11 15:44:51 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/3] git commit: changing the server instance to localhost instead
of gw127
Posted by ch...@apache.org.
changing the server instance to localhost instead of gw127
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b19a8e06
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b19a8e06
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b19a8e06
Branch: refs/heads/master
Commit: b19a8e06d17b853f2fe1fe41b67ff8f2d83747bc
Parents: 538e37f
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Thu Aug 14 09:38:45 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Thu Aug 14 09:38:45 2014 -0400
----------------------------------------------------------------------
.../airavata/client/tools/RegisterSampleApplications.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b19a8e06/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
index b5e93b3..b3b0024 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
@@ -52,10 +52,10 @@ import org.slf4j.LoggerFactory;
public class RegisterSampleApplications {
- public static final String THRIFT_SERVER_HOST = "gw127.iu.xsede.org";
-// public static final String THRIFT_SERVER_HOST = "localhost";
- public static final int THRIFT_SERVER_PORT = 9930;
-// public static final int THRIFT_SERVER_PORT = 8930;
+// public static final String THRIFT_SERVER_HOST = "gw127.iu.xsede.org";
+ public static final String THRIFT_SERVER_HOST = "localhost";
+// public static final int THRIFT_SERVER_PORT = 9930;
+ public static final int THRIFT_SERVER_PORT = 8930;
private final static Logger logger = LoggerFactory.getLogger(RegisterSampleApplications.class);
private static final String DEFAULT_GATEWAY = "default";
private static Airavata.Client airavataClient;