camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: Revert "CAMEL-8639: Ensure FTP uses the FTP poll strategy by default. Thanks to Rob Sessink for the patch."
Date Sun, 19 Jul 2015 08:08:43 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 560044167 -> 10e9a9b87


Revert "CAMEL-8639: Ensure FTP uses the FTP poll strategy by default. Thanks to Rob Sessink
for the patch."

This reverts commit 560044167b6605abcd439716a58da5dd23759f4e.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/10e9a9b8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/10e9a9b8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/10e9a9b8

Branch: refs/heads/camel-2.14.x
Commit: 10e9a9b8747b86bc6355f2d08e9b03c809ec70ec
Parents: 5600441
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Jul 19 10:15:24 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Jul 19 10:15:24 2015 +0200

----------------------------------------------------------------------
 .../file/remote/RemoteFileEndpoint.java         |  6 ----
 ...moteFilePollingConsumerPollStrategyTest.java | 30 --------------------
 2 files changed, 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/10e9a9b8/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
index e327292..97a310d 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
@@ -50,9 +50,6 @@ public abstract class RemoteFileEndpoint<T> extends GenericFileEndpoint<T>
{
         // for ftp we need to use higher interval/checkout that for files
         setReadLockTimeout(20000);
         setReadLockCheckInterval(5000);
-        // explicitly set RemoteFilePollingConsumerPollStrategy otherwise
-        // DefaultPollingConsumerPollStrategy is be used
-        setPollStrategy(new RemoteFilePollingConsumerPollStrategy());
     }
 
     public RemoteFileEndpoint(String uri, RemoteFileComponent<T> component, RemoteFileConfiguration
configuration) {
@@ -61,9 +58,6 @@ public abstract class RemoteFileEndpoint<T> extends GenericFileEndpoint<T>
{
         // for ftp we need to use higher interval/checkout that for files
         setReadLockTimeout(20000);
         setReadLockCheckInterval(5000);
-        // explicitly set RemoteFilePollingConsumerPollStrategy otherwise
-        // DefaultPollingConsumerPollStrategy is be used
-        setPollStrategy(new RemoteFilePollingConsumerPollStrategy());
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/10e9a9b8/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteEndPointRemoteFilePollingConsumerPollStrategyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteEndPointRemoteFilePollingConsumerPollStrategyTest.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteEndPointRemoteFilePollingConsumerPollStrategyTest.java
deleted file mode 100644
index 1d05b97..0000000
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteEndPointRemoteFilePollingConsumerPollStrategyTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.file.remote;
-
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-
-public class RemoteEndPointRemoteFilePollingConsumerPollStrategyTest extends CamelTestSupport
{
-
-    @Test
-    public void testPollStrategy() throws Exception {
-        RemoteFileEndpoint<?> endpoint = context.getEndpoint("ftp://hostname", RemoteFileEndpoint.class);
-        assertTrue(endpoint.getPollStrategy() instanceof RemoteFilePollingConsumerPollStrategy);
-    }
-
-}


Mime
View raw message