svn commit: r1531497 - /airavata/sandbox/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java

[lahiru]

Author: lahiru
Date: Sat Oct 12 04:28:37 2013
New Revision: 1531497

URL: http://svn.apache.org/r1531497
Log:
fixing compilation error.

Modified:
    
airavata/sandbox/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java

Modified: 
airavata/sandbox/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java
URL: 
http://svn.apache.org/viewvc/airavata/sandbox/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java?rev=1531497&r1=1531496&r2=1531497&view=diff
==============================================================================
--- 
airavata/sandbox/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java
 (original)
+++ 
airavata/sandbox/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java
 Sat Oct 12 04:28:37 2013
@@ -144,15 +144,9 @@ public class SSHUtils {
         channel.connect();
 
         if (checkAck(in) != 0) {
-<<<<<<< .mine
             String error = "Error Reading input Stream";
             log.error(error);
             throw new SSHApiException(error);
-=======
-            String error = "Error transfering the file content";
-            log.error(error);
-            throw new SSHApiException(error);
->>>>>>> .r1531420
         }
 
         File _lfile = new File(lFile);