You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ftpserver-commits@incubator.apache.org by ng...@apache.org on 2007/02/26 22:11:36 UTC

svn commit: r512035 - in /incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver: FtpServer.java listener/ConnectionManagerImpl.java

Author: ngn
Date: Mon Feb 26 14:11:35 2007
New Revision: 512035

URL: http://svn.apache.org/viewvc?view=rev&rev=512035
Log:
No only creates default context in FtpServer if needed, not always.
Stale connection timer now created as a daemon timer. (both FTPSERVER-75)

Modified:
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpServer.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/ConnectionManagerImpl.java

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpServer.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpServer.java?view=diff&rev=512035&r1=512034&r2=512035
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpServer.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpServer.java Mon Feb 26 14:11:35 2007
@@ -35,7 +35,7 @@
     private static final Logger LOG = LoggerFactory.getLogger(FtpServer.class);
     
     
-    private FtpServerContext serverContext = new DefaultFtpServerContext();
+    private FtpServerContext serverContext;
 
     private boolean suspended;
 
@@ -46,6 +46,7 @@
      * @throws Exception 
      */
     public FtpServer() throws Exception {
+        serverContext = new DefaultFtpServerContext();
     }
 
     /**

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/ConnectionManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/ConnectionManagerImpl.java?view=diff&rev=512035&r1=512034&r2=512035
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/ConnectionManagerImpl.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/ConnectionManagerImpl.java Mon Feb 26 14:11:35 2007
@@ -70,7 +70,7 @@
         pollIntervalSec = config.getInt     ("timeout-poll-interval",   60);
         
         // set timer to remove inactive users and load data
-        timer = new Timer();
+        timer = new Timer(true);
         TimerTask timerTask = new TimerTask() {
             public void run() {
                 timerTask();