svn commit: r712728 - in /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel: impl/DefaultUnitOfWork.java management/CamelNamingStrategy.java model/RouteType.java processor/interceptor/TraceInterceptor.java

[ja...@apache.org]

Author: janstey
Date: Mon Nov 10 11:40:38 2008
New Revision: 712728

URL: http://svn.apache.org/viewvc?rev=712728&view=rev
Log:
Minor cleanup

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java?rev=712728&r1=712727&r2=712728&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java Mon Nov 10 11:40:38 2008
@@ -38,7 +38,6 @@
     private String id;
     private List<Synchronization> synchronizations;
     private List<AsyncCallback> asyncCallbacks;
-    private CountDownLatch latch;
 
     public DefaultUnitOfWork() {
     }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java?rev=712728&r1=712727&r2=712728&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java Mon Nov 10 11:40:38 2008
@@ -150,8 +150,15 @@
     public ObjectName getObjectName(RouteContext routeContext, ProcessorType processor)
         throws MalformedObjectNameException {
         Endpoint<? extends Exchange> ep = routeContext.getEndpoint();
-        String ctxid = ep != null ? getContextId(ep.getCamelContext()) : VALUE_UNKNOWN;
-        String cid = ObjectName.quote(ep.getEndpointUri());
+        String ctxid;
+        String cid;
+        if (ep != null) {
+            ctxid = getContextId(ep.getCamelContext());            
+            cid = ObjectName.quote(ep.getEndpointUri());            
+        } else {
+            ctxid = VALUE_UNKNOWN;
+            cid = null;
+        }
         //String id = VALUE_UNKNOWN.equals(cid) ? ObjectName.quote(getEndpointId(ep) : "[" + cid + "]" + ObjectName.quote(getEndpointId(ep);
         String nodeId = processor.idOrCreate();
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java?rev=712728&r1=712727&r2=712728&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java Mon Nov 10 11:40:38 2008
@@ -78,11 +78,9 @@
     public void addRoutes(CamelContext context, Collection<Route> routes) throws Exception {
         setCamelContext(context);
 
-        if (context instanceof CamelContext) {
-            ErrorHandlerBuilder handler = context.getErrorHandlerBuilder();
-            if (handler != null) {
-                setErrorHandlerBuilderIfNull(handler);
-            }
+        ErrorHandlerBuilder handler = context.getErrorHandlerBuilder();
+        if (handler != null) {
+            setErrorHandlerBuilderIfNull(handler);
         }
 
         for (FromType fromType : inputs) {

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java?rev=712728&r1=712727&r2=712728&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java Mon Nov 10 11:40:38 2008
@@ -120,8 +120,7 @@
      * Returns true if the given exchange should be logged in the trace list
      */
     protected boolean shouldLogExchange(Exchange exchange) {
-        return (tracer == null || tracer.isEnabled())
-            && (tracer.getTraceFilter() == null || tracer.getTraceFilter().matches(exchange));
+        return tracer.isEnabled() && (tracer.getTraceFilter() == null || tracer.getTraceFilter().matches(exchange));
     }
 
     /**