camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r744090 - /camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
Date Fri, 13 Feb 2009 11:55:37 GMT
Author: davsclaus
Date: Fri Feb 13 11:55:36 2009
New Revision: 744090

URL: http://svn.apache.org/viewvc?rev=744090&view=rev
Log:
ignoreing error during shutdown of the ftp server for unit testing, as it tends to happen
on the other platforms once in a while.

Modified:
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java?rev=744090&r1=744089&r2=744090&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
(original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
Fri Feb 13 11:55:36 2009
@@ -54,10 +54,16 @@
     }
 
     protected void tearDown() throws Exception {
-        super.tearDown();
-        ftpServer.stop();
-        ftpServer = null;
-        port = 0;
+        try {
+            super.tearDown();
+            ftpServer.stop();
+            ftpServer = null;
+            port = 0;
+        } catch (Exception e) {
+            // ignore while shutting down as we could be polling during shutdown
+            // and get errors when the ftp server is stopping. This is only an issue
+            // since we host the ftp server embedded in the same jvm for unit testing
+        }
     }
 
     protected void initFtpServer() throws Exception {



Mime
View raw message