airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramin...@apache.org
Subject svn commit: r1470516 - /airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GridFTPInputHandler.java
Date Mon, 22 Apr 2013 13:54:04 GMT
Author: raminder
Date: Mon Apr 22 13:54:04 2013
New Revision: 1470516

URL: http://svn.apache.org/r1470516
Log:
We need to only set the remote path in the target application. AIRAVATA-826

Modified:
    airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GridFTPInputHandler.java

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GridFTPInputHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GridFTPInputHandler.java?rev=1470516&r1=1470515&r2=1470516&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GridFTPInputHandler.java
(original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GridFTPInputHandler.java
Mon Apr 22 13:54:04 2013
@@ -119,10 +119,10 @@ public class GridFTPInputHandler impleme
         for (String endpoint : gridFTPEndpointArray) {
             URI inputURI = GFacUtils.createGsiftpURI(endpoint, app.getInputDataDirectory());
             String fileName = new File(gridftpURL.getPath()).getName();
-            String s = inputURI.getPath() + File.separator + fileName;
+            String destLocalPath = inputURI.getPath() + File.separator + fileName;
             //if user give a url just to refer an endpoint, not a web resource we are not
doing any transfer
             if (fileName != null && !"".equals(fileName)) {
-                destURI = GFacUtils.createGsiftpURI(endpoint, s);
+                destURI = GFacUtils.createGsiftpURI(endpoint, destLocalPath);
                 if (paramValue.startsWith("gsiftp")) {
                 	// no need to do if it is unicore, as unicore will download this on user's
behalf to the job space dir
                 	if(isInputNonLocal) ftp.uploadFile(gridftpURL, destURI, gssCred);
@@ -160,7 +160,7 @@ public class GridFTPInputHandler impleme
                 return paramValue;
             }
         }
-        return destURI.toString();
+        return destURI.getPath();
     }
 
 



Mime
View raw message