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

[da...@apache.org]

Author: davsclaus
Date: Fri Jan 27 11:38:56 2012
New Revision: 1236639

URL: http://svn.apache.org/viewvc?rev=1236639&view=rev
Log:
Tighten up default uow. Unreigster from inflight before sending event. This also helps unit test with NotifyBuilder and checking inflight register is 0 when done.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.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=1236639&r1=1236638&r2=1236639&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 Jan 27 11:38:56 2012
@@ -70,9 +70,12 @@ public class DefaultUnitOfWork implement
     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);
+
+    protected DefaultUnitOfWork(Exchange exchange, Logger logger) {
+        log = logger;
+        if (log.isTraceEnabled()) {
+            log.trace("UnitOfWork created for ExchangeId: {} with {}", exchange.getExchangeId(), exchange);
+        }
         tracedRouteNodes = new DefaultTracedRouteNodes();
         context = exchange.getContext();
 
@@ -107,7 +110,12 @@ public class DefaultUnitOfWork implement
         }
 
         // fire event
-        EventHelper.notifyExchangeCreated(exchange.getContext(), exchange);
+        try {
+            EventHelper.notifyExchangeCreated(exchange.getContext(), exchange);
+        } catch (Throwable e) {
+            // must catch exceptions to ensure the exchange is not failing due to notification event failed
+            log.warn("Exception occurred during event notification. This exception will be ignored.", e);
+        }
 
         // register to inflight registry
         if (exchange.getContext() != null) {
@@ -218,6 +226,11 @@ public class DefaultUnitOfWork implement
             log.warn("Exception occurred during savepoint onDone. This exception will be ignored.", e);
         }
 
+        // unregister from inflight registry, before signalling we are done
+        if (exchange.getContext() != null) {
+            exchange.getContext().getInflightRepository().remove(exchange);
+        }
+
         // then fire event to signal the exchange is done
         try {
             if (failed) {
@@ -228,11 +241,6 @@ public class DefaultUnitOfWork implement
         } catch (Throwable e) {
             // must catch exceptions to ensure synchronizations is also invoked
             log.warn("Exception occurred during event notification. This exception will be ignored.", e);
-        } finally {
-            // unregister from inflight registry
-            if (exchange.getContext() != null) {
-                exchange.getContext().getInflightRepository().remove(exchange);
-            }
         }
     }
 
@@ -301,7 +309,9 @@ public class DefaultUnitOfWork implement
 
     @Override
     public void beginSubUnitOfWork(Exchange exchange) {
-        log.trace("beginSubUnitOfWork exchangeId: {}", exchange.getExchangeId());
+        if (log.isTraceEnabled()) {
+            log.trace("beginSubUnitOfWork exchangeId: {}", exchange.getExchangeId());
+        }
 
         if (subUnitOfWorks == null) {
             subUnitOfWorks = new Stack<DefaultSubUnitOfWork>();
@@ -311,7 +321,9 @@ public class DefaultUnitOfWork implement
 
     @Override
     public void endSubUnitOfWork(Exchange exchange) {
-        log.trace("endSubUnitOfWork exchangeId: {}", exchange.getExchangeId());
+        if (log.isTraceEnabled()) {
+            log.trace("endSubUnitOfWork exchangeId: {}", exchange.getExchangeId());
+        }
 
         if (subUnitOfWorks == null || subUnitOfWorks.isEmpty()) {
             return;
@@ -342,7 +354,9 @@ public class DefaultUnitOfWork implement
             // by the error handler which we want to react with the result of the sub unit of work
             exchange.setProperty(Exchange.ERRORHANDLER_HANDLED, null);
             exchange.setProperty(Exchange.FAILURE_HANDLED, null);
-            log.trace("endSubUnitOfWork exchangeId: {} with {} caused exceptions.", exchange.getExchangeId(), list.size());
+            if (log.isTraceEnabled()) {
+                log.trace("endSubUnitOfWork exchangeId: {} with {} caused exceptions.", exchange.getExchangeId(), list != null ? list.size() : 0);
+            }
         }
     }