commit d14bc8a7cc0593689d284f41fa2ca1f982dffd22
author Gandhi <vgandhi1@LAMU02W82E9HTD6.uhc.com> Thu Jan 17 13:52:24 2019 +0530
committer Andrea Cosentino <ancosen@gmail.com> Thu Jan 17 12:08:05 2019 +0100
tree 65e00922061aeaa00a5fcc709e7f550431c199cb
parent 0cd8db226a30f354bc7c1c25572d85521f6fb4b5

CAMEL-13072 remove the exception block

camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java

diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
index 3f48ac9..dd95259 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
@@ -330,12 +330,7 @@
     }
 
     public RouteContext popRouteContext() {
-        try {
-            return routeContextStack.pop();
-        } catch (NoSuchElementException e) {
-            // ignore and return null
-        }
-        return null;
+        return routeContextStack.pollFirst();
     }
 
     public AsyncCallback beforeProcess(Processor processor, Exchange exchange, AsyncCallback callback) {