Author: ngn
Date: Mon Dec 29 11:44:16 2008
New Revision: 729984
URL: http://svn.apache.org/viewvc?rev=729984&view=rev
Log:
Applying clean up patch from Jiri Kuhn (FTPSERVER-248)
Added:
mina/ftpserver/trunk/core/api-breakage.txt
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java
Added: mina/ftpserver/trunk/core/api-breakage.txt
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/api-breakage.txt?rev=729984&view=auto
==============================================================================
--- mina/ftpserver/trunk/core/api-breakage.txt (added)
+++ mina/ftpserver/trunk/core/api-breakage.txt Mon Dec 29 11:44:16 2008
@@ -0,0 +1,3 @@
+* Renamed DataConnectionConfigurationFactory.setPassiveExernalAddress to
DataConnectionConfigurationFactory.setPassiveExternalAddress
+* Updated to MINA 2.0.0-M4, including some changes to the IoSession, most
notably the remove of traffic masks
+* Added FtpSession.getSessionId()
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java?rev=729984&r1=729983&r2=729984&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java
Mon Dec 29 11:44:16 2008
@@ -94,7 +94,6 @@
LOG.error(entry.getKey() + " :: FtpletHandler.destroy()", ex);
}
}
- ftplets.clear();
}
/**
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java?rev=729984&r1=729983&r2=729984&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java
Mon Dec 29 11:44:16 2008
@@ -114,6 +114,9 @@
listener.stop();
}
+ // destroy the Ftplet container
+ serverContext.getFtpletContainer().destroy();
+
// release server resources
if (serverContext != null) {
serverContext.dispose();
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java?rev=729984&r1=729983&r2=729984&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java
Mon Dec 29 11:44:16 2008
@@ -189,17 +189,8 @@
* Close all the components.
*/
public void dispose() {
-
- Iterator<Listener> listenerIter = listeners.values().iterator();
- while (listenerIter.hasNext()) {
- Listener listener = listenerIter.next();
- listener.stop();
- }
-
- // now tell Ftplets to destroy themselves
- if(ftpletContainer != null) {
- ftpletContainer.destroy();
- }
+ listeners.clear();
+ ftpletContainer.getFtplets().clear();
}
public Listener getListener(String name) {
