svn commit: r655816 - in /mina/ftpserver/trunk/core/src: main/java/org/apache/ftpserver/listener/mina/MinaListener.java test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java test/java/org/apache/ftpserver/clienttests/ConnectTest.java

[ng...@apache.org]

Author: ngn
Date: Tue May 13 04:16:06 2008
New Revision: 655816

URL: http://svn.apache.org/viewvc?rev=655816&view=rev
Log:
Make sure getPort() actually returns the port the listener is really bound to (FTPSERVER-134)

Added:
    mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java
Modified:
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java
    mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java

Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java?rev=655816&r1=655815&r2=655816&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java Tue May 13 04:16:06 2008
@@ -71,7 +71,7 @@
 
 	private FtpHandler handler = new DefaultFtpHandler();
 	
-	private int idleTimeout = 60;
+	private int idleTimeout = 300;
 	
 	private List<InetAddress> blockedAddresses;
 	private List<Subnet> blockedSubnets;
@@ -165,6 +165,9 @@
         acceptor.setHandler(new FtpHandlerAdapter(context, handler));
         
         acceptor.bind(address);
+        
+        // update the port to the real port bound by the listener
+        setPort(acceptor.getLocalAddress().getPort());
     }
 
     /**

Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java?rev=655816&r1=655815&r2=655816&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java Tue May 13 04:16:06 2008
@@ -112,9 +112,15 @@
 
         server = createServer();
         
-        server.start();
+        if(isStartServer()) {
+            server.start();
+        }
     }
 
+    protected boolean isStartServer() {
+        return true;
+    }
+    
     protected FTPClient createFTPClient() throws Exception {
         return new FTPClient();
     }

Added: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java?rev=655816&view=auto
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java (added)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java Tue May 13 04:16:06 2008
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
+package org.apache.ftpserver.clienttests;
+
+import org.apache.ftpserver.listener.mina.MinaListener;
+
+
+public class ConnectTest extends ClientTestTemplate {
+
+    @Override
+    protected boolean isConnectClient() {
+        return false;
+    }
+
+    @Override
+    protected boolean isStartServer() {
+        return false;
+    }
+
+    public void testPortWithZeroPort() throws Exception {
+        ((MinaListener)server.getServerContext().getListener("default")).setPort(0);
+        assertEquals(0, ((MinaListener)server.getServerContext().getListener("default")).getPort());
+        
+        server.start();
+        
+        assertTrue(((MinaListener)server.getServerContext().getListener("default")).getPort() > 0);
+    }
+    
+    public void testPort() throws Exception {
+        assertEquals(port, ((MinaListener)server.getServerContext().getListener("default")).getPort());
+        
+        server.start();
+        
+        assertEquals(port, ((MinaListener)server.getServerContext().getListener("default")).getPort());
+    }
+}