Author: davsclaus
Date: Thu May 27 06:26:09 2010
New Revision: 948686
URL: http://svn.apache.org/viewvc?rev=948686&view=rev
Log:
CAMEL-2755: Fixed VM component to better detect queue name disregard number of
parameters.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmUseSameQueueTest.java
(with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java?rev=948686&r1=948685&r2=948686&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
Thu May 27 06:26:09 2010
@@ -32,9 +32,9 @@ import org.apache.camel.impl.DefaultComp
* @version $Revision$
*/
public class SedaComponent extends DefaultComponent {
+ protected final int maxConcurrentConsumers = 500;
private final Map<String, BlockingQueue<Exchange>> queues = new
HashMap<String, BlockingQueue<Exchange>>();
- private final int maxConcurrentConsumers = 500;
-
+
public synchronized BlockingQueue<Exchange> createQueue(String uri,
Map<String, Object> parameters) {
String key = getQueueKey(uri);
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java?rev=948686&r1=948685&r2=948686&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
Thu May 27 06:26:09 2010
@@ -19,12 +19,11 @@ package org.apache.camel.component.vm;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.component.seda.SedaComponent;
-import org.apache.camel.component.seda.SedaEndpoint;
/**
* An implementation of the <a href="http://camel.apache.org/vm.html";>VM
components</a>
@@ -39,22 +38,24 @@ public class VmComponent extends SedaCom
private static final AtomicInteger START_COUNTER = new AtomicInteger();
@Override
- protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
- BlockingQueue<Exchange> blockingQueue = getBlockingQueue(uri,
parameters);
- SedaEndpoint answer = new SedaEndpoint(uri, this, blockingQueue);
- answer.configureProperties(parameters);
- return answer;
- }
+ public synchronized BlockingQueue<Exchange> createQueue(String uri,
Map<String, Object> parameters) {
+ String key = getQueueKey(uri);
- protected BlockingQueue<Exchange> getBlockingQueue(String uri, Map<String,
Object> parameters) {
- synchronized (QUEUES) {
- BlockingQueue<Exchange> answer = QUEUES.get(uri);
- if (answer == null) {
- answer = createQueue(uri, parameters);
- QUEUES.put(uri, answer);
- }
- return answer;
+ if (QUEUES.containsKey(key)) {
+ return QUEUES.get(key);
}
+
+ // create queue
+ BlockingQueue<Exchange> queue;
+ Integer size = getAndRemoveParameter(parameters, "size",
Integer.class);
+ if (size != null && size > 0) {
+ queue = new LinkedBlockingQueue<Exchange>(size);
+ } else {
+ queue = new LinkedBlockingQueue<Exchange>();
+ }
+
+ QUEUES.put(key, queue);
+ return queue;
}
@Override
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmUseSameQueueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmUseSameQueueTest.java?rev=948686&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmUseSameQueueTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmUseSameQueueTest.java
Thu May 27 06:26:09 2010
@@ -0,0 +1,48 @@
+/**
+ * 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.vm;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version $Revision$
+ */
+public class VmUseSameQueueTest extends ContextTestSupport {
+
+ public void testVmUseSameQueue() throws Exception {
+ getMockEndpoint("mock:result").expectedMessageCount(2);
+
+ template.sendBody("direct:start", "Hello World");
+ template.sendBody("direct:start", "Bye World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .to("vm:foo?size=500");
+
+ from("vm:foo").to("mock:result");
+ }
+ };
+ }
+}
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmUseSameQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmUseSameQueueTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
