Author: ngn
Date: Fri Oct 31 12:31:59 2008
New Revision: 709542
URL: http://svn.apache.org/viewvc?rev=709542&view=rev
Log:
Skip afterCommand if Ftplet.beforeCommand returns SKIP (FTPSERVER-211)
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=709542&r1=709541&r2=709542&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
Fri Oct 31 12:31:59 2008
@@ -138,20 +138,21 @@
FtpReply.REPLY_502_COMMAND_NOT_IMPLEMENTED,
"not.implemented", null));
}
- }
- try {
- ftpletRet = ftplets.afterCommand(session.getFtpletSession(),
- request);
- } catch (Exception e) {
- LOG.debug("Ftplet container threw exception", e);
- ftpletRet = FtpletResult.DISCONNECT;
- }
- if (ftpletRet == FtpletResult.DISCONNECT) {
- session.closeOnFlush().awaitUninterruptibly(10000);
- return;
+ try {
+ ftpletRet =
ftplets.afterCommand(session.getFtpletSession(),
+ request);
+ } catch (Exception e) {
+ LOG.debug("Ftplet container threw exception", e);
+ ftpletRet = FtpletResult.DISCONNECT;
+ }
+ if (ftpletRet == FtpletResult.DISCONNECT) {
+ session.closeOnFlush().awaitUninterruptibly(10000);
+ return;
+ }
}
+
} catch (Exception ex) {
// send error reply
