svn commit: r997856 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/test/java/org/apache/camel/component/ref/ components/camel-spring/src/test/java/org/apache/camel/component/xslt/

[da...@apache.org]

Author: davsclaus
Date: Thu Sep 16 17:28:17 2010
New Revision: 997856

URL: http://svn.apache.org/viewvc?rev=997856&view=rev
Log:
CAMEL-3130: Fixed ref component causing delay and initialDelay options to be reset.

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/ref/RefFileEndpointTest.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltOutputStringTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java?rev=997856&r1=997855&r2=997856&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java Thu Sep 16 17:28:17 2010
@@ -77,7 +77,7 @@ public abstract class DefaultComponent e
             return null;
         }
 
-        if (parameters != null) {
+        if (parameters != null && !parameters.isEmpty()) {
             endpoint.configureProperties(parameters);
             if (useIntrospectionOnEndpoint()) {
                 setProperties(endpoint, parameters);

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/ref/RefFileEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/ref/RefFileEndpointTest.java?rev=997856&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/ref/RefFileEndpointTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/ref/RefFileEndpointTest.java Thu Sep 16 17:28:17 2010
@@ -0,0 +1,68 @@
+/**
+ * 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.ref;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.file.FileConsumer;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.SimpleRegistry;
+
+/**
+ * @version $Revision$
+ */
+public class RefFileEndpointTest extends ContextTestSupport {
+
+    private SimpleRegistry registry = new SimpleRegistry();
+
+    @Override
+    protected void setUp() throws Exception {
+        deleteDirectory("target/foo");
+        super.setUp();
+    }
+
+    public void testRefFileEndpoint() throws Exception {
+        getMockEndpoint("mock:result").expectedMessageCount(1);
+
+        template.sendBodyAndHeader("file:target/foo", "Hello World", Exchange.FILE_NAME, "hello.txt");
+
+        assertMockEndpointsSatisfied();
+
+        FileConsumer consumer = (FileConsumer) context.getRoute("foo").getConsumer();
+        assertEquals(3000, consumer.getDelay());
+        assertEquals(250, consumer.getInitialDelay());
+    }
+
+    @Override
+    protected CamelContext createCamelContext() throws Exception {
+        CamelContext context = new DefaultCamelContext(registry);
+        registry.put("foo", context.getEndpoint("file:target/foo?initialDelay=250&delay=3000&delete=true"));
+        return context;
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("ref:foo").routeId("foo").to("mock:result");
+            }
+        };
+    }
+}

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltOutputStringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltOutputStringTest.java?rev=997856&r1=997855&r2=997856&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltOutputStringTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltOutputStringTest.java Thu Sep 16 17:28:17 2010
@@ -39,8 +39,6 @@ public class XsltOutputStringTest extend
         template.sendBody("direct:start", "<hello>world!</hello>");
 
         assertMockEndpointsSatisfied();
-
-
     }
 
 }