You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2009/01/13 22:54:52 UTC

svn commit: r734250 - /mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java

Author: ngn
Date: Tue Jan 13 13:54:50 2009
New Revision: 734250

URL: http://svn.apache.org/viewvc?rev=734250&view=rev
Log:
Make sure we dispose the FileSystemView when the user session ends (FTPSERVER-262)

Modified:
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java

Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java?rev=734250&r1=734249&r2=734250&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java Tue Jan 13 13:54:50 2009
@@ -23,6 +23,7 @@
 
 import org.apache.ftpserver.command.Command;
 import org.apache.ftpserver.command.CommandFactory;
+import org.apache.ftpserver.ftplet.FileSystemView;
 import org.apache.ftpserver.ftplet.FtpReply;
 import org.apache.ftpserver.ftplet.FtpRequest;
 import org.apache.ftpserver.ftplet.FtpletResult;
@@ -81,9 +82,18 @@
             context.getFtpletContainer().onDisconnect(
                     session.getFtpletSession());
         } catch (Exception e) {
-            // shallow the exception, we're closing down the session anyways
+            // swallow the exception, we're closing down the session anyways
             LOG.warn("Ftplet threw an exception on disconnect", e);
         }
+        
+        FileSystemView fs = session.getFileSystemView();
+        if(fs != null) {
+            try  {
+                fs.dispose();
+            } catch (Exception e) {
+                LOG.warn("FileSystemView threw an exception on disposal", e);
+            }
+        }
 
         ServerFtpStatistics stats = ((ServerFtpStatistics) context
                 .getFtpStatistics());