camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r760891 - in /camel/branches/camel-1.x: ./ components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java components/camel-xmpp/src/test/resources/
Date Wed, 01 Apr 2009 13:50:32 GMT
Author: davsclaus
Date: Wed Apr  1 13:50:30 2009
New Revision: 760891

URL: http://svn.apache.org/viewvc?rev=760891&view=rev
Log:
Merged revisions 760890 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r760890 | davsclaus | 2009-04-01 15:46:01 +0200 (Wed, 01 Apr 2009) | 1 line
  
  Mina - use a timeout for writing to mina in case mina is hanging, otherwise we will hang
forever. The client will get an exception anyway that the write failed.
........

Modified:
    camel/branches/camel-1.x/   (props changed)
    camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java
    camel/branches/camel-1.x/components/camel-xmpp/src/test/resources/   (props changed)

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  1 13:50:30 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890

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

Modified: camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java?rev=760891&r1=760890&r2=760891&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java
(original)
+++ camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java
Wed Apr  1 13:50:30 2009
@@ -42,7 +42,8 @@
     public static void writeBody(IoSession session, Object body, Exchange exchange) throws
CamelExchangeException {
         // the write operation is asynchronous. Use WriteFuture to wait until the session
has been written
         WriteFuture future = session.write(body);
-        future.join();
+        // must use a timeout (we use 10s) as in some very high performance scenarious a
write can cause thred hanging forever
+        future.join(10 * 1000L);
         if (!future.isWritten()) {
             throw new CamelExchangeException("Could not write body", exchange);
         }

Propchange: camel/branches/camel-1.x/components/camel-xmpp/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  1 13:50:30 2009
@@ -1 +1 @@
-/camel/trunk/components/camel-xmpp/src/test/resources:757693,757743,757865,758539,758563,758617,758692,758990,759362,759887,759931
+/camel/trunk/components/camel-xmpp/src/test/resources:757693,757743,757865,758539,758563,758617,758692,758990,759362,759887,759931,760890



Mime
View raw message