Author: ngn Date: Fri Oct 31 06:51:23 2008 New Revision: 709413 URL: http://svn.apache.org/viewvc?rev=709413&view=rev Log: DefaultFtplet.onSite() should be called before the command, not after (FTPSERVER-209)
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java?rev=709413&r1=709412&r2=709413&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java Fri Oct 31 06:51:23 2008 @@ -694,7 +694,7 @@ FtpletContainer container = createFtpletContainer(ftplets); - container.afterCommand(new DefaultFtpSession(null), new DefaultFtpRequest( + container.beforeCommand(new DefaultFtpSession(null), new DefaultFtpRequest( "SITE")); assertEquals(2, calls.size()); Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java?rev=709413&r1=709412&r2=709413&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java Fri Oct 31 06:51:23 2008 @@ -211,6 +211,11 @@ MockFtplet.callback = new MockFtpletCallback() { public FtpletResult onSite(FtpSession session, FtpRequest request) throws FtpException, IOException { + session + .write(new DefaultFtpReply( + FtpReply.REPLY_553_REQUESTED_ACTION_NOT_TAKEN_FILE_NAME_NOT_ALLOWED, + "foo")); + throwException(); return mockReturnValue; } Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java?rev=709413&r1=709412&r2=709413&view=diff ============================================================================== --- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java (original) +++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java Fri Oct 31 06:51:23 2008 @@ -67,6 +67,8 @@ return onUploadUniqueStart(session, request); } else if ("RNTO".equals(command)) { return onRenameStart(session, request); + } else if ("SITE".equals(command)) { + return onSite(session, request); } else { // TODO should we call a catch all? return null; @@ -96,8 +98,6 @@ return onUploadUniqueEnd(session, request); } else if ("RNTO".equals(command)) { return onRenameEnd(session, request); - } else if ("SITE".equals(command)) { - return onSite(session, request); } else { // TODO should we call a catch all? return null;