svn commit: r1128271 - in /camel/trunk/camel-core/src/main/java/org/apache/camel/model: ProcessDefinition.java RollbackDefinition.java

[davsclaus]

Author: davsclaus
Date: Fri May 27 11:52:36 2011
New Revision: 1128271

URL: http://svn.apache.org/viewvc?rev=1128271&view=rev
Log:
Polished tracing a bit

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java?rev=1128271&r1=1128270&r2=1128271&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
 Fri May 27 11:52:36 2011
@@ -83,17 +83,18 @@ public class ProcessDefinition extends N
 
     @Override
     public Processor createProcessor(RouteContext routeContext) {
+        Processor answer = processor;
         if (processor == null) {
             ObjectHelper.notNull(ref, "ref", this);
-            processor = routeContext.lookup(getRef(), Processor.class);
-            ObjectHelper.notNull(processor, "registry entry called " + 
getRef(), this);
+            answer = routeContext.lookup(getRef(), Processor.class);
+            ObjectHelper.notNull(answer, "registry entry called " + getRef(), 
this);
         }
 
         // ensure its wrapped in a Service so we can manage it from eg. JMX
         // (a Processor must be a Service to be enlisted in JMX)
-        if (!(processor instanceof Service)) {
-            processor = new WrapProcessor(processor, processor);
+        if (!(answer instanceof Service)) {
+            answer = new WrapProcessor(answer, answer);
         }
-        return processor;
+        return answer;
     }
 }

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java?rev=1128271&r1=1128270&r2=1128271&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
 Fri May 27 11:52:36 2011
@@ -60,6 +60,11 @@ public class RollbackDefinition extends 
     }
 
     @Override
+    public String getLabel() {
+        return "rollback";
+    }
+
+    @Override
     public Processor createProcessor(RouteContext routeContext) {
         // validate that only either mark rollbacks is chosen and not both
         if (isMarkRollbackOnly() && isMarkRollbackOnlyLast()) {