Author: davsclaus
Date: Sun Oct 9 07:49:25 2011
New Revision: 1180559
URL: http://svn.apache.org/viewvc?rev=1180559&view=rev
Log:
Trying to fix compilation on earlier versions of JDK6 on windows boxes as
reported by Apache Jenkins CI servers.
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 07:49:25 2011
@@ -1 +1 @@
-/camel/trunk:1178509,1179125,1179198,1180321,1180345
+/camel/trunk:1169608,1178509,1179125,1179198,1180321,1180345
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java?rev=1180559&r1=1180558&r2=1180559&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
Sun Oct 9 07:49:25 2011
@@ -131,7 +131,9 @@ public class LoadBalanceDefinition exten
LoadBalancer loadBalancer =
LoadBalancerDefinition.getLoadBalancer(routeContext, loadBalancerType, ref);
for (ProcessorDefinition<?> processorType : getOutputs()) {
// output must not be another load balancer
- if (processorType instanceof LoadBalanceDefinition) {
+ // check for instanceof as the code below as there is compilation
errors on earlier versions of JDK6
+ // on Windows boxes or with IBM JDKs etc.
+ if (LoadBalanceDefinition.class.isInstance(processorType)) {
throw new IllegalArgumentException("Loadbalancer already
configured to: " + loadBalancerType + ". Cannot set it to: " + processorType);
}
Processor processor = processorType.createProcessor(routeContext);