Author: hadrian
Date: Thu Apr 30 15:05:01 2009
New Revision: 770271
URL: http://svn.apache.org/viewvc?rev=770271&view=rev
Log:
Remove comment about use of SNAPSHOT in camel-ftp.
Modified:
camel/branches/camel-1.x/components/camel-ftp/pom.xml
camel/branches/camel-1.x/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java
Modified: camel/branches/camel-1.x/components/camel-ftp/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-ftp/pom.xml?rev=770271&r1=770270&r2=770271&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-ftp/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-ftp/pom.xml Thu Apr 30 15:05:01 2009
@@ -135,17 +135,12 @@
<build>
<plugins>
- <!-- Exclude tests from buld due to dependency on SNAPSHOT version of
- apache ftpserver. Reenable after a proper release of ftpserver!!! -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
- <!-- <testExcludes>
- <exclude>**/*Test.*</exclude>
- </testExcludes> -->
</configuration>
</plugin>
<plugin>
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=770271&r1=770270&r2=770271&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
Thu Apr 30 15:05:01 2009
@@ -42,7 +42,7 @@
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);
- // must use a timeout (we use 10s) as in some very high performance scenarious a
write can cause thred hanging forever
+ // must use a timeout (we use 10s) as in some very high performance scenarios a write
can cause thread hanging forever
future.join(10 * 1000L);
if (!future.isWritten()) {
throw new CamelExchangeException("Could not write body", exchange);
|