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 2010/09/15 14:31:03 UTC
svn commit: r997310 - in /mina/ftpserver:
branches/1.0.x/core/src/main/java/org/apache/ftpserver/listener/
branches/1.0.x/core/src/main/java/org/apache/ftpserver/listener/nio/
trunk/core/src/main/java/org/apache/ftpserver/listener/
trunk/core/src/main/...
Author: ngn
Date: Wed Sep 15 12:31:03 2010
New Revision: 997310
URL: http://svn.apache.org/viewvc?rev=997310&view=rev
Log:
Adding check so that NioListener.start() can not be called on a started listener (FTPSERVER-386)
Modified:
mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/listener/Listener.java
mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/Listener.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
Modified: mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/listener/Listener.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/listener/Listener.java?rev=997310&r1=997309&r2=997310&view=diff
==============================================================================
--- mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/listener/Listener.java (original)
+++ mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/listener/Listener.java Wed Sep 15 12:31:03 2010
@@ -59,7 +59,7 @@ public interface Listener {
/**
* Checks if the listener is currently started.
*
- * @return True if the listener is started
+ * @return False if the listener is started
*/
boolean isStopped();
Modified: mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java?rev=997310&r1=997309&r2=997310&view=diff
==============================================================================
--- mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java (original)
+++ mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java Wed Sep 15 12:31:03 2010
@@ -111,6 +111,11 @@ public class NioListener extends Abstrac
* @see Listener#start(FtpServerContext)
*/
public synchronized void start(FtpServerContext context) {
+ if(!isStopped()) {
+ // listener already started, don't allow
+ throw new IllegalStateException("Listener already started");
+ }
+
try {
this.context = context;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/Listener.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/Listener.java?rev=997310&r1=997309&r2=997310&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/Listener.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/Listener.java Wed Sep 15 12:31:03 2010
@@ -59,7 +59,7 @@ public interface Listener {
/**
* Checks if the listener is currently started.
*
- * @return True if the listener is started
+ * @return False if the listener is started
*/
boolean isStopped();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java?rev=997310&r1=997309&r2=997310&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java Wed Sep 15 12:31:03 2010
@@ -103,6 +103,11 @@ public class NioListener extends Abstrac
* @see Listener#start(FtpServerContext)
*/
public synchronized void start(FtpServerContext context) {
+ if(!isStopped()) {
+ // listener already started, don't allow
+ throw new IllegalStateException("Listener already started");
+ }
+
try {
this.context = context;