svn commit: r1183426 - in /camel/trunk/camel-core/src/main/java/org/apache/camel/impl: DefaultUnitOfWork.java MDCUnitOfWork.java

[dk...@apache.org]

Author: dkulp
Date: Fri Oct 14 17:08:46 2011
New Revision: 1183426

URL: http://svn.apache.org/viewvc?rev=1183426&view=rev
Log:
Make sure the DefaultUnitOfWork doesn't lookup a logger per instance.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java?rev=1183426&r1=1183425&r2=1183426&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java Fri Oct 14 17:08:46 2011
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
  * The default implementation of {@link org.apache.camel.spi.UnitOfWork}
  */
 public class DefaultUnitOfWork implements UnitOfWork, Service {
-    protected final transient Logger log = LoggerFactory.getLogger(getClass());
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultUnitOfWork.class);
 
     // TODO: This implementation seems to have transformed itself into a to broad concern
     // where unit of work is doing a bit more work than the transactional aspect that ties
@@ -65,8 +65,13 @@ public class DefaultUnitOfWork implement
     private Set<Object> transactedBy;
     private final Stack<RouteContext> routeContextStack = new Stack<RouteContext>();
     private Stack<DefaultSubUnitOfWork> subUnitOfWorks;
-
+    private final transient Logger log;
+    
     public DefaultUnitOfWork(Exchange exchange) {
+        this(exchange, LOG);
+    }
+    protected DefaultUnitOfWork(Exchange exchange, Logger l) {
+        log = l;
         log.trace("UnitOfWork created for ExchangeId: {} with {}", exchange.getExchangeId(), exchange);
         tracedRouteNodes = new DefaultTracedRouteNodes();
         context = exchange.getContext();

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java?rev=1183426&r1=1183425&r2=1183426&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java Fri Oct 14 17:08:46 2011
@@ -21,6 +21,8 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.spi.RouteContext;
 import org.apache.camel.spi.UnitOfWork;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 
 /**
@@ -36,6 +38,8 @@ public class MDCUnitOfWork extends Defau
     public static final String MDC_ROUTE_ID = "routeId";
     public static final String MDC_TRANSACTION_KEY = "transactionKey";
 
+    private static final Logger LOG = LoggerFactory.getLogger(MDCUnitOfWork.class);
+
     private final String originalBreadcrumbId;
     private final String originalExchangeId;
     private final String originalCorrelationId;
@@ -43,7 +47,7 @@ public class MDCUnitOfWork extends Defau
     private final String originalTransactionKey;
 
     public MDCUnitOfWork(Exchange exchange) {
-        super(exchange);
+        super(exchange, LOG);
 
         // remember existing values
         this.originalExchangeId = MDC.get(MDC_EXCHANGE_ID);