You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/10/14 19:14:15 UTC
svn commit: r1183433 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
Author: dkulp
Date: Fri Oct 14 17:14:14 2011
New Revision: 1183433
URL: http://svn.apache.org/viewvc?rev=1183433&view=rev
Log:
Merged revisions 1183426 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1183426 | dkulp | 2011-10-14 13:08:46 -0400 (Fri, 14 Oct 2011) | 1 line
Make sure the DefaultUnitOfWork doesn't lookup a logger per instance.
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 14 17:14:14 2011
@@ -1 +1 @@
-/camel/trunk:1182369
+/camel/trunk:1182369,1183426
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/impl/DefaultUnitOfWork.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java?rev=1183433&r1=1183432&r2=1183433&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java Fri Oct 14 17:14:14 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/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java?rev=1183433&r1=1183432&r2=1183433&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java Fri Oct 14 17:14:14 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);