camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1326483 - in /camel/branches/camel-2.9.x: ./ components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
Date Mon, 16 Apr 2012 04:48:01 GMT
Author: davsclaus
Date: Mon Apr 16 04:48:00 2012
New Revision: 1326483

URL: http://svn.apache.org/viewvc?rev=1326483&view=rev
Log:
Fix test may hang during stopping

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1326481

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java?rev=1326483&r1=1326482&r2=1326483&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
(original)
+++ camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
Mon Apr 16 04:48:00 2012
@@ -95,7 +95,7 @@ public abstract class ScpServerTestSuppo
 
         if (sshd != null) {
             try {
-                sshd.stop();
+                sshd.stop(true);
                 sshd = null;
             } catch (Exception e) {
                 // ignore while shutting down as we could be polling during shutdown



Mime
View raw message