From 331115a9e552cb180fdcda95cc7fbd071b0e1aa8 Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Thu, 10 Oct 2013 10:04:26 -0500
Subject: [PATCH] Fix Merge Issue.

Former-commit-id: 66eb9a198321c7a093160fdfc4fcf37e0ad5afeb [formerly 62db4d7b07ae1d4468d067f6b1aa745ded1d2264] [formerly 21df04ff399c4560adc1c15b60a9759e27d56b0c] [formerly db25d33a4d42271c5dfc998dbb67f0dfe7b2280d [formerly 21df04ff399c4560adc1c15b60a9759e27d56b0c [formerly 91716e4f6eb81153afa48266cdd43e3239864301]]]
Former-commit-id: db25d33a4d42271c5dfc998dbb67f0dfe7b2280d
Former-commit-id: f179478893abf5c2314388f9c1627b156e2a7ac8 [formerly 1263d95220ade4d73678001eaae27afd25316c3b]
Former-commit-id: e130d1ce58864080efb36b32445c101e0ddf831d
---
 edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
index 9d2c4567b8..91920b91e7 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
@@ -153,7 +153,7 @@
                 </doCatch>
             </doTry>
         </route>
-
+    </camelContext>
 
     <bean factory-bean="clusteredCamelContextMgr" factory-method="register">
         <constructor-arg ref="clusteredGfeIngestRoutes"/>