Author: ngn
Date: Sun Mar 9 14:57:56 2008
New Revision: 635375
URL: http://svn.apache.org/viewvc?rev=635375&view=rev
Log:
Make stop() idempotent
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java?rev=635375&r1=635374&r2=635375&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
(original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
Sun Mar 9 14:57:56 2008
@@ -76,7 +76,11 @@
* Stop the server. Stop the listener thread.
*/
public void stop() {
-
+ if(!started || serverContext == null) {
+ // we have already been stopped, ignore
+ return;
+ }
+
// stop all listeners
Listener[] listeners = serverContext.getListeners();
for (int i = 0; i<listeners.length; i++) {
