fixing AIRAVATA-1852
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d527fc5a Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d527fc5a Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d527fc5a Branch: refs/heads/master Commit: d527fc5a50665802569676d65df63c4372c9c3b2 Parents: 9ce83af Author: Chathuri Wimalasena <[email protected]> Authored: Wed Jan 20 12:05:47 2016 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Wed Jan 20 12:05:47 2016 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/airavata/gfac/impl/SSHUtils.java | 6 ++++++ .../org/apache/airavata/gfac/impl/task/SCPDataStageTask.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/d527fc5a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/SSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/SSHUtils.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/SSHUtils.java index a110956..2281ebc 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/SSHUtils.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/SSHUtils.java @@ -346,6 +346,11 @@ public class SSHUtils { break; } } + if (fileSize == 0L){ + String error = "Input file is empty..."; + log.error(error); + throw new JSchException(error); + } String initData = "C0644 " + fileSize + " " + fileName + "\n"; assert dout != null; dout.write(initData.getBytes()); @@ -396,6 +401,7 @@ public class SSHUtils { } catch (Exception e) { log.error(e.getMessage(), e); + throw new JSchException(e.getMessage()); } finally { try { if (dout != null) dout.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/d527fc5a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java index ac001ca..605b972 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java @@ -206,7 +206,7 @@ public class SCPDataStageTask implements Task { errorModel.setUserFriendlyMessage(msg); taskContext.getTaskModel().setTaskError(errorModel); } catch (SSHApiException e) { - String msg = "Failed to do scp with compute resource"; + String msg = e.getMessage(); log.error(msg, e); status.setState(TaskState.FAILED); status.setReason(msg);
