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 2009/11/19 12:27:17 UTC

svn commit: r882110 - in /mina/ftpserver: branches/1.0.x/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java

Author: ngn
Date: Thu Nov 19 11:27:00 2009
New Revision: 882110

URL: http://svn.apache.org/viewvc?rev=882110&view=rev
Log:
Fixing NPE thrown when restarting a stopped FtpServer and improving Javadoc for this (FTPSERVER-340)

Modified:
    mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java

Modified: mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java?rev=882110&r1=882109&r2=882110&view=diff
==============================================================================
--- mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java (original)
+++ mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java Thu Nov 19 11:27:00 2009
@@ -67,6 +67,10 @@
      * @throws FtpException 
      */
     public void start() throws FtpException {
+        if (serverContext == null) {
+            // we have already been stopped, can not be restarted
+            throw new IllegalStateException("FtpServer has been stopped. Restart is not supported");
+        }
 
         List<Listener> startedListeners = new ArrayList<Listener>();
         
@@ -99,7 +103,8 @@
     }
 
     /**
-     * Stop the server. Stop the listener thread.
+     * Stop the server. Stopping the server will close completely and 
+     * it not supported to restart using {@link #start()}.
      */
     public void stop() {
         if (serverContext == null) {

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=882110&r1=882109&r2=882110&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 Thu Nov 19 11:27:00 2009
@@ -67,6 +67,10 @@
      * @throws FtpException 
      */
     public void start() throws FtpException {
+        if (serverContext == null) {
+            // we have already been stopped, can not be restarted
+            throw new IllegalStateException("FtpServer has been stopped. Restart is not supported");
+        }
 
         List<Listener> startedListeners = new ArrayList<Listener>();
         
@@ -99,7 +103,8 @@
     }
 
     /**
-     * Stop the server. Stop the listener thread.
+     * Stop the server. Stopping the server will close completely and 
+     * it not supported to restart using {@link #start()}.
      */
     public void stop() {
         if (serverContext == null) {