svn commit: r670784 - in /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel: management/InstrumentationLifecycleStrategy.java model/InterceptType.java model/ProcessorType.java

[ningjiang]

Author: ningjiang
Date: Mon Jun 23 15:42:33 2008
New Revision: 670784

URL: http://svn.apache.org/viewvc?rev=670784&view=rev
Log:
CAMEL-631 applied patch with thanks to Jonathan

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java?rev=670784&r1=670783&r2=670784&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
 Mon Jun 23 15:42:33 2008
@@ -199,7 +199,7 @@
             List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
 
             // separate out the exception handers in the outputs
-            for (ProcessorType<?> output : routeType.getOutputs()) {
+            for (ProcessorType output : routeType.getOutputs()) {
                 if (output instanceof ExceptionType) {
                     exceptionHandlers.add(output);
                 } else {

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java?rev=670784&r1=670783&r2=670784&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
 Mon Jun 23 15:42:33 2008
@@ -85,8 +85,8 @@
 
         if (answer.getOutputs().size() > 0) {
             // this is for the predicate version
-            ProcessorType<?> processor = answer;
-            processor = (ProcessorType<?>) answer.getOutputs().get(0);
+            ProcessorType processor = answer;
+            processor = (ProcessorType) answer.getOutputs().get(0);
             if (processor instanceof ChoiceType) {
                 ChoiceType choice = (ChoiceType) processor;
                 proxifyProceed(this.getProceed(), answer.getProceed(),

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=670784&r1=670783&r2=670784&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
 Mon Jun 23 15:42:33 2008
@@ -1583,8 +1583,9 @@
         for (ProcessorType output : outputs) {
             Processor processor = output.createProcessor(routeContext);
             processor = output.wrapProcessorInInterceptors(routeContext, 
processor);
-            
-            if (!(this instanceof ExceptionType || this instanceof TryType)) {
+           
+            ProcessorType currentProcessor = this; 
+            if (!(currentProcessor instanceof ExceptionType || 
currentProcessor instanceof TryType)) {
                 processor = output.wrapInErrorHandler(routeContext, processor);
             }