Changeset 719 for extensions/net.sf.basedb.ftp

Timestamp:

Jun 5, 2008, 1:55:51 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #114: Implement FTP Server

If server fails to start, makes sure everything is clean up and configuration files are re-read when trying again.

Location:

extensions/net.sf.basedb.ftp/trunk/src/net/sf/basedb/clients/ftp

Files:

• BaseFtpServer.java (modified) (2 diffs)
• FtpServiceController.java (modified) (1 diff)

extensions/net.sf.basedb.ftp/trunk/src/net/sf/basedb/clients/ftp/BaseFtpServer.java

@@ -195 +195 @@
     catch (Exception ex)
     {
+      server = null;
       log.error("Could not start FTP Server", ex);
       throw new RuntimeException(ex);
@@ -209 +210 @@
     if (server != null)
     {
-      server.stop();
+      try
+      {
+        server.stop();
+      }
+      catch (Throwable t)
+      {
+        log.warn("Error when stopping FTP Server", t);
+      }
       server = null;
     }

extensions/net.sf.basedb.ftp/trunk/src/net/sf/basedb/clients/ftp/FtpServiceController.java

@@ -75 +75 @@
   public void start() 
   {
-    getServer().start();
+    try
+    {
+      getServer().start();
+    }
+    catch (RuntimeException ex)
+    {
+      server = null;
+      throw ex;
+    }
   }