You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2014/07/11 18:20:23 UTC
[1/2] git commit: fix AIRAVATA-1346
Repository: airavata
Updated Branches:
refs/heads/master 2beace387 -> c3ca7af33
fix AIRAVATA-1346
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/90569d84
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/90569d84
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/90569d84
Branch: refs/heads/master
Commit: 90569d84317fbd18f774415962d0715c08e85352
Parents: 1c5b22a
Author: raminder <ra...@apache.org>
Authored: Fri Jul 11 12:20:02 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Fri Jul 11 12:20:02 2014 -0400
----------------------------------------------------------------------
.../org/apache/airavata/gsi/ssh/impl/StandardOutReader.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/90569d84/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/StandardOutReader.java
----------------------------------------------------------------------
diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/StandardOutReader.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/StandardOutReader.java
index 2c3d1a6..105b6cf 100644
--- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/StandardOutReader.java
+++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/StandardOutReader.java
@@ -22,6 +22,7 @@ package org.apache.airavata.gsi.ssh.impl;
import com.jcraft.jsch.Channel;
import com.jcraft.jsch.ChannelExec;
+
import org.apache.airavata.gsi.ssh.api.CommandOutput;
import java.io.ByteArrayOutputStream;
@@ -36,6 +37,11 @@ public class StandardOutReader implements CommandOutput {
public void onOutput(Channel channel) {
try {
StringBuffer pbsOutput = new StringBuffer("");
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
InputStream inputStream = channel.getInputStream();
byte[] tmp = new byte[1024];
while (true) {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by ra...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c3ca7af3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c3ca7af3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c3ca7af3
Branch: refs/heads/master
Commit: c3ca7af335eb4b7d0ead2f66685c5078f3398331
Parents: 90569d8 2beace3
Author: raminder <ra...@apache.org>
Authored: Fri Jul 11 12:20:07 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Fri Jul 11 12:20:07 2014 -0400
----------------------------------------------------------------------
.../registry/jpa/impl/ExperimentRegistry.java | 62 ++++++++++++++------
.../jpa/utils/ThriftDataModelConversion.java | 24 ++++++--
2 files changed, 62 insertions(+), 24 deletions(-)
----------------------------------------------------------------------