[camel] branch camel-2.23.x updated: CAMEL-13072 remove the exception block

[ac...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch camel-2.23.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-2.23.x by this push:
     new 24d0858  CAMEL-13072 remove the exception block
24d0858 is described below

commit 24d08582db3f084976b49f40f16a84d6adad36f8
Author: Gandhi <vg...@LAMU02W82E9HTD6.uhc.com>
AuthorDate: Thu Jan 17 13:52:24 2019 +0530

    CAMEL-13072 remove the exception block
---
 .../src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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 51af899..0e98b10 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 class DefaultUnitOfWork implements UnitOfWork, Service {
     }
 
     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) {