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 2008/08/15 23:08:19 UTC
svn commit: r686366 - in /mina/ftpserver/trunk:
core/src/test/java/org/apache/ftpserver/ftplet/
ftplet-api/src/main/java/org/apache/ftpserver/ftplet/
Author: ngn
Date: Fri Aug 15 14:08:19 2008
New Revision: 686366
URL: http://svn.apache.org/viewvc?rev=686366&view=rev
Log:
onLogin should be called after authentication
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/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/ftplet/FtpLetContainerTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java?rev=686366&r1=686365&r2=686366&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java Fri Aug 15 14:08:19 2008
@@ -156,7 +156,7 @@
container.addFtplet("ftplet1", ftplet1);
container.addFtplet("ftplet2", ftplet2);
- container.beforeCommand(new FtpSessionImpl(null), new FtpRequestImpl("PASS"));
+ container.afterCommand(new FtpSessionImpl(null), new FtpRequestImpl("PASS"));
assertEquals(2, calls.size());
assertEquals("ftplet1", calls.get(0));
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java?rev=686366&r1=686365&r2=686366&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java Fri Aug 15 14:08:19 2008
@@ -72,6 +72,7 @@
try {
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
+ client.noop();
fail("Must throw FTPConnectionClosedException");
} catch (FTPConnectionClosedException e) {
// OK
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java?rev=686366&r1=686365&r2=686366&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java Fri Aug 15 14:08:19 2008
@@ -70,7 +70,7 @@
}
};
- assertFalse(client.login(ADMIN_USERNAME, ADMIN_PASSWORD));
+ assertTrue(client.login(ADMIN_USERNAME, ADMIN_PASSWORD));
}
public void testExceptionDuringDeleteStart() throws Exception {
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=686366&r1=686365&r2=686366&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 Aug 15 14:08:19 2008
@@ -38,9 +38,7 @@
public FtpletEnum beforeCommand(FtpSession session, FtpRequest request) throws FtpException, IOException {
String command = request.getCommand().toUpperCase();
- if("PASS".equals(command)) {
- return onLogin(session, request);
- } else if("DELE".equals(command)) {
+ if("DELE".equals(command)) {
return onDeleteStart(session, request);
} else if("STOR".equals(command)) {
return onUploadStart(session, request);
@@ -66,7 +64,9 @@
String command = request.getCommand().toUpperCase();
- if("DELE".equals(command)) {
+ if("PASS".equals(command)) {
+ return onLogin(session, request);
+ } else if("DELE".equals(command)) {
return onDeleteEnd(session, request);
} else if("STOR".equals(command)) {
return onUploadEnd(session, request);