[Cogkit-svn] SF.net SVN: cogkit: [1875] trunk/current/src/cog/modules/provider-gt2

[<ha...@us...>]

Revision: 1875
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1875&view=rev
Author:   hategan
Date:     2008-02-11 11:27:41 -0800 (Mon, 11 Feb 2008)

Log Message:
-----------
fixed some channel reuse issues

Modified Paths:
--------------
    trunk/current/src/cog/modules/provider-gt2/CHANGES.txt
    trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/FileResourceImpl.java

Modified: trunk/current/src/cog/modules/provider-gt2/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/CHANGES.txt	2008-02-06 21:43:25 UTC (rev 1874)
+++ trunk/current/src/cog/modules/provider-gt2/CHANGES.txt	2008-02-11 19:27:41 UTC (rev 1875)
@@ -1,3 +1,7 @@
+(02/11/2008)
+
+*** The last commit broke things (mlst seems picky).
+
 (02/01/2008)
 
 *** Missed some spots on the data channel reuse.

Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/FileResourceImpl.java	2008-02-06 21:43:25 UTC (rev 1874)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/FileResourceImpl.java	2008-02-11 19:27:41 UTC (rev 1875)
@@ -24,6 +24,7 @@
 import org.globus.cog.abstraction.interfaces.GridFile;
 import org.globus.cog.abstraction.interfaces.SecurityContext;
 import org.globus.cog.abstraction.interfaces.ServiceContact;
+import org.globus.ftp.GridFTPSession;
 import org.globus.ftp.MlsxEntry;
 import org.globus.ftp.exception.ClientException;
 import org.globus.ftp.exception.ServerException;
@@ -155,7 +156,7 @@
              * It's twice as fast as doing a cwd
              */
             try {
-                initializeDataChannel();
+                this.getGridFTPClient().setPassiveMode(false);
                 MlsxEntry me = this.getGridFTPClient().mlst(dirName);
                 return me.get("type").endsWith("dir");
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.