Author: davsclaus
Date: Wed Mar 7 21:29:39 2012
New Revision: 1298131
URL: http://svn.apache.org/viewvc?rev=1298131&view=rev
Log:
CAMEL-5058: Reverted rev 1296653 as new patch is on the way.
Removed:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/InflightRepositoryRemoveRouteTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/spi/InflightRepository.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 7 21:29:39 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java?rev=1298131&r1=1298130&r2=1298131&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
Wed Mar 7 21:29:39 2012
@@ -77,15 +77,6 @@ public class DefaultInflightRepository e
return answer != null ? answer.get() : 0;
}
- public void removeEndpoint(Endpoint endpoint) {
- // remove endpoint if there is no current inflight
- String key = endpoint.getEndpointKey();
- AtomicInteger existing = endpointCount.get(key);
- if (existing != null && existing.get() <= 0) {
- endpointCount.remove(key);
- }
- }
-
@Override
protected void doStart() throws Exception {
}
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java?rev=1298131&r1=1298130&r2=1298131&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
Wed Mar 7 21:29:39 2012
@@ -265,11 +265,6 @@ public class RouteService extends ChildS
for (LifecycleStrategy strategy :
camelContext.getLifecycleStrategies()) {
strategy.onRoutesRemove(routes);
}
-
- // remove the routes from the inflight registry
- for (Route route : routes) {
-
camelContext.getInflightRepository().removeEndpoint(route.getEndpoint());
- }
// remove the routes from the collections
camelContext.removeRouteCollection(routes);
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/spi/InflightRepository.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/spi/InflightRepository.java?rev=1298131&r1=1298130&r2=1298131&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/spi/InflightRepository.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/spi/InflightRepository.java
Wed Mar 7 21:29:39 2012
@@ -60,13 +60,4 @@ public interface InflightRepository exte
*/
int size(Endpoint endpoint);
- /**
- * Remove a endpoint from this registry.
- * <p/>
- * This is used to cleanup resources that are no longer needed.
- *
- * @param endpoint the endpoint to remove
- */
- void removeEndpoint(Endpoint endpoint);
-
}
