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

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

Revision: 1871
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1871&view=rev
Author:   hategan
Date:     2008-02-01 10:37:39 -0800 (Fri, 01 Feb 2008)

Log Message:
-----------
updated list() to reuse data channels

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
    trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java

Modified: trunk/current/src/cog/modules/provider-gt2/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/CHANGES.txt	2008-01-27 23:42:24 UTC (rev 1870)
+++ trunk/current/src/cog/modules/provider-gt2/CHANGES.txt	2008-02-01 18:37:39 UTC (rev 1871)
@@ -1,3 +1,7 @@
+(02/01/2008)
+
+*** Missed some spots on the data channel reuse.
+
 (12/03/2007)
 
 *** Added data channel reuse mode for GridFTP if the server

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-01-27 23:42:24 UTC (rev 1870)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/FileResourceImpl.java	2008-02-01 18:37:39 UTC (rev 1871)
@@ -69,7 +69,7 @@
         }
         else {
             try {
-                this.getGridFTPClient().setPassiveMode(true);
+                initializeDataChannel();
                 Vector v = this.getGridFTPClient().mlsd();
                 ArrayList list = new ArrayList();
                 Iterator i = v.iterator();
@@ -126,7 +126,7 @@
         }
         else {
             try {
-                this.getGridFTPClient().setPassiveMode(true);
+                initializeDataChannel();
                 Vector v = this.getGridFTPClient().mlsd(directory);
                 ArrayList list = new ArrayList();
                 Iterator i = v.iterator();
@@ -155,7 +155,7 @@
              * It's twice as fast as doing a cwd
              */
             try {
-                this.getGridFTPClient().setPassiveMode(false);
+                initializeDataChannel();
                 MlsxEntry me = this.getGridFTPClient().mlst(dirName);
                 return me.get("type").endsWith("dir");
             }

Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java	2008-01-27 23:42:24 UTC (rev 1870)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java	2008-02-01 18:37:39 UTC (rev 1871)
@@ -125,7 +125,7 @@
         }
     }
 
-    private void initializeDataChannel() throws ClientException,
+    protected void initializeDataChannel() throws ClientException,
             ServerException, IOException {
         if (!dataChannelInitialized || !dataChannelReuse) {
             gridFTPClient.setPassiveMode(true);


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