Author: davsclaus
Date: Thu Aug 11 16:41:35 2011
New Revision: 1156666
URL: http://svn.apache.org/viewvc?rev=1156666&view=rev
Log:
Polished
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java?rev=1156666&r1=1156665&r2=1156666&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
Thu Aug 11 16:41:35 2011
@@ -150,7 +150,7 @@ public class AggregateDefinition extends
executorService =
ExecutorServiceHelper.getConfiguredExecutorService(routeContext, "Aggregator",
this);
if (executorService == null) {
if (isParallelProcessing()) {
- // we are running in parallel so create a cached thread pool
which grows/shrinks automatic
+ // we are running in parallel so create a thread pool
executorService =
routeContext.getCamelContext().getExecutorServiceStrategy().newDefaultThreadPool(this,
"Aggregator");
} else {
// use a synchronous thread pool if we are not running in
parallel (will always use caller thread)
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java?rev=1156666&r1=1156665&r2=1156666&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
Thu Aug 11 16:41:35 2011
@@ -213,7 +213,7 @@ public class MulticastDefinition extends
executorService =
ExecutorServiceHelper.getConfiguredExecutorService(routeContext, "Multicast",
this);
if (isParallelProcessing() && executorService == null) {
- // we are running in parallel so create a cached thread pool which
grows/shrinks automatic
+ // we are running in parallel so create a thread pool
executorService =
routeContext.getCamelContext().getExecutorServiceStrategy().newDefaultThreadPool(this,
"Multicast");
}
long timeout = getTimeout() != null ? getTimeout() : 0;
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java?rev=1156666&r1=1156665&r2=1156666&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
Thu Aug 11 16:41:35 2011
@@ -120,7 +120,7 @@ public class RecipientListDefinition<Typ
}
executorService =
ExecutorServiceHelper.getConfiguredExecutorService(routeContext,
"RecipientList", this);
if (isParallelProcessing() && executorService == null) {
- // we are running in parallel so create a cached thread pool which
grows/shrinks automatic
+ // we are running in parallel so create a thread pool
executorService =
routeContext.getCamelContext().getExecutorServiceStrategy().newDefaultThreadPool(this,
"RecipientList");
}
answer.setExecutorService(executorService);
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java?rev=1156666&r1=1156665&r2=1156666&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
Thu Aug 11 16:41:35 2011
@@ -98,7 +98,7 @@ public class SplitDefinition extends Exp
executorService =
ExecutorServiceHelper.getConfiguredExecutorService(routeContext, "Split", this);
if (isParallelProcessing() && executorService == null) {
- // we are running in parallel so create a cached thread pool which
grows/shrinks automatic
+ // we are running in parallel so create a thread pool
executorService =
routeContext.getCamelContext().getExecutorServiceStrategy().newDefaultThreadPool(this,
"Split");
}
long timeout = getTimeout() != null ? getTimeout() : 0;
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java?rev=1156666&r1=1156665&r2=1156666&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
Thu Aug 11 16:41:35 2011
@@ -84,6 +84,7 @@ public class WireTapDefinition<Type exte
executorService =
ExecutorServiceHelper.getConfiguredExecutorService(routeContext, "WireTap",
this);
if (executorService == null) {
+ // thread pool is mandatory for wire tap
executorService =
routeContext.getCamelContext().getExecutorServiceStrategy().newDefaultThreadPool(this,
"WireTap");
}
WireTapProcessor answer = new WireTapProcessor(endpoint, getPattern(),
executorService);