Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 79424 invoked from network); 6 Nov 2009 19:57:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Nov 2009 19:57:33 -0000 Received: (qmail 99603 invoked by uid 500); 6 Nov 2009 19:57:32 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 99520 invoked by uid 500); 6 Nov 2009 19:57:32 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 99511 invoked by uid 99); 6 Nov 2009 19:57:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Nov 2009 19:57:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Nov 2009 19:57:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3501A2388A53; Fri, 6 Nov 2009 19:56:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r833539 - in /commons/proper/vfs/branches/VFS281: core/src/main/java/org/apache/commons/vfs/provider/AbstractFileSystem.java xdocs/changes.xml Date: Fri, 06 Nov 2009 19:56:41 -0000 To: commits@commons.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091106195641.3501A2388A53@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rgoers Date: Fri Nov 6 19:56:40 2009 New Revision: 833539 URL: http://svn.apache.org/viewvc?rev=833539&view=rev Log: Apply patch for VFS-287 Modified: commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/AbstractFileSystem.java commons/proper/vfs/branches/VFS281/xdocs/changes.xml Modified: commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/AbstractFileSystem.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/AbstractFileSystem.java?rev=833539&r1=833538&r2=833539&view=diff ============================================================================== --- commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/AbstractFileSystem.java (original) +++ commons/proper/vfs/branches/VFS281/core/src/main/java/org/apache/commons/vfs/provider/AbstractFileSystem.java Fri Nov 6 19:56:40 2009 @@ -544,6 +544,10 @@ if (listeners != null) { listeners.remove(listener); + if (listeners.isEmpty()) + { + listenerMap.remove(file.getName()); + } } } } Modified: commons/proper/vfs/branches/VFS281/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS281/xdocs/changes.xml?rev=833539&r1=833538&r2=833539&view=diff ============================================================================== --- commons/proper/vfs/branches/VFS281/xdocs/changes.xml (original) +++ commons/proper/vfs/branches/VFS281/xdocs/changes.xml Fri Nov 6 19:56:40 2009 @@ -23,6 +23,9 @@ + + LocalFileName objects are not released from AbstractFileSystem.listenerMap when all listeners are removed. + The FTP Configuration includes an option to set a timeout for the data connection, but not for the socket timeout. This is a problem, as idle sockets can cause your download to hang forever and never timeout.