Author: dkulp
Date: Fri Jul 8 19:52:44 2011
New Revision: 1144462
URL: http://svn.apache.org/viewvc?rev=1144462&view=rev
Log:
Merged revisions 1102177 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1102177 | davsclaus | 2011-05-12 02:13:05 -0400 (Thu, 12 May 2011) | 1 line
CAMEL-3965: ftp producer should force reconnection attempt if sending noop
fails in pre write check.
........
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 19:52:44 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,1094123,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1096736,1097761,1097909,1097912,1097978,1098032,1098628,1098630,1099228,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
+/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,1094123,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1096736,1097761,1097909,1097912,1097978,1098032,1098628,1098630,1099228,1099417,1100975,1102162,1102177,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.7.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java?rev=1144462&r1=1144461&r2=1144462&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
Fri Jul 8 19:52:44 2011
@@ -102,6 +102,8 @@ public class RemoteFileProducer<T> exten
} catch (Exception e) {
// ignore as we will try to recover connection
noop = false;
+ // mark as not logged in, since the noop failed
+ loggedIn = false;
}
}
@@ -191,7 +193,7 @@ public class RemoteFileProducer<T> exten
}
protected void connectIfNecessary() throws
GenericFileOperationFailedException {
- if (!loggedIn) {
+ if (!getOperations().isConnected()) {
if (log.isDebugEnabled()) {
log.debug("Not already connected/logged in. Connecting to: " +
getEndpoint());
}
