Author: davsclaus
Date: Fri Feb 1 16:28:26 2013
New Revision: 1441512
URL: http://svn.apache.org/viewvc?rev=1441512&view=rev
Log:
Stop sftp asap as otherwise it may hang forever due a latch not being counted
down
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1441508
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java?rev=1441512&r1=1441511&r2=1441512&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
Fri Feb 1 16:28:26 2013
@@ -80,7 +80,8 @@ public class SftpServerTestSupport exten
if (sshd != null) {
try {
- sshd.stop();
+ // stop asap as we may hang forever
+ sshd.stop(true);
sshd = null;
} catch (Exception e) {
// ignore while shutting down as we could be polling during
shutdown
