Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 909DFE3FD for ; Sat, 26 Jan 2013 11:47:07 +0000 (UTC) Received: (qmail 78862 invoked by uid 500); 26 Jan 2013 11:47:06 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 78823 invoked by uid 500); 26 Jan 2013 11:47:06 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 78796 invoked by uid 99); 26 Jan 2013 11:47:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jan 2013 11:47:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jan 2013 11:47:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 87B692388A39; Sat, 26 Jan 2013 11:46:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1438881 - in /camel/branches/camel-2.10.x: ./ components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java Date: Sat, 26 Jan 2013 11:46:42 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130126114642.87B692388A39@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Sat Jan 26 11:46:42 2013 New Revision: 1438881 URL: http://svn.apache.org/viewvc?rev=1438881&view=rev Log: CAMEL-5999: Improved restlet component to better deregister restlet routers when routes is removed in Camel. Modified: camel/branches/camel-2.10.x/ (props changed) camel/branches/camel-2.10.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java camel/branches/camel-2.10.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java Propchange: camel/branches/camel-2.10.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1438880 Propchange: camel/branches/camel-2.10.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.10.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java?rev=1438881&r1=1438880&r2=1438881&view=diff ============================================================================== --- camel/branches/camel-2.10.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java (original) +++ camel/branches/camel-2.10.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java Sat Jan 26 11:46:42 2013 @@ -65,6 +65,10 @@ class MethodBasedRouter extends Restlet void removeRoute(Method method) { routes.remove(method); } + + boolean hasRoutes() { + return !routes.isEmpty(); + } /** * This method does "test-and-set" on the underlying flag that indicates Modified: camel/branches/camel-2.10.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java?rev=1438881&r1=1438880&r2=1438881&view=diff ============================================================================== --- camel/branches/camel-2.10.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java (original) +++ camel/branches/camel-2.10.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java Sat Jan 26 11:46:42 2013 @@ -117,6 +117,8 @@ public class RestletComponent extends He @Override protected void doStop() throws Exception { component.stop(); + // component stop will stop servers so we should clear our list as well + servers.clear(); // routers map entries are removed as consumer stops and servers map // is not touch so to keep in sync with component's servers super.doStop(); @@ -147,20 +149,20 @@ public class RestletComponent extends He public void disconnect(RestletConsumer consumer) throws Exception { RestletEndpoint endpoint = consumer.getEndpoint(); - List routers = new ArrayList(); + List routesToRemove = new ArrayList(); String pattern = decodePattern(endpoint.getUriPattern()); if (pattern != null && !pattern.isEmpty()) { - routers.add(getMethodRouter(pattern)); + routesToRemove.add(getMethodRouter(pattern, false)); } if (endpoint.getRestletUriPatterns() != null) { for (String uriPattern : endpoint.getRestletUriPatterns()) { - routers.add(getMethodRouter(uriPattern)); + routesToRemove.add(getMethodRouter(uriPattern, false)); } } - for (MethodBasedRouter router : routers) { + for (MethodBasedRouter router : routesToRemove) { if (endpoint.getRestletMethods() != null) { Method[] methods = endpoint.getRestletMethods(); for (Method method : methods) { @@ -174,13 +176,22 @@ public class RestletComponent extends He LOG.debug("Detached restlet uriPattern: {} method: {}", router.getUriPattern(), endpoint.getRestletMethod()); } + + // remove router if its no longer in use + if (!router.hasRoutes()) { + deattachUriPatternFrimRestlet(router.getUriPattern(), endpoint, router); + if (!router.isStopped()) { + router.stop(); + } + routers.remove(router.getUriPattern()); + } } } - private MethodBasedRouter getMethodRouter(String uriPattern) { + private MethodBasedRouter getMethodRouter(String uriPattern, boolean addIfEmpty) { synchronized (routers) { MethodBasedRouter result = routers.get(uriPattern); - if (result == null) { + if (result == null && addIfEmpty) { result = new MethodBasedRouter(uriPattern); LOG.debug("Added method based router: {}", result); routers.put(uriPattern, result); @@ -255,9 +266,9 @@ public class RestletComponent extends He return endpoint.getHost() + ":" + endpoint.getPort(); } - private void attachUriPatternToRestlet(String uriPattern, RestletEndpoint endpoint, Restlet target) { + private void attachUriPatternToRestlet(String uriPattern, RestletEndpoint endpoint, Restlet target) throws Exception { uriPattern = decodePattern(uriPattern); - MethodBasedRouter router = getMethodRouter(uriPattern); + MethodBasedRouter router = getMethodRouter(uriPattern, true); Map realm = endpoint.getRestletRealm(); if (realm != null && realm.size() > 0) { @@ -289,6 +300,16 @@ public class RestletComponent extends He component.getDefaultHost().attach(uriPattern, router); LOG.debug("Attached methodRouter uriPattern: {}", uriPattern); } + + if (!router.isStarted()) { + router.start(); + LOG.debug("Started methodRouter uriPattern: {}", uriPattern); + } + } + + private void deattachUriPatternFrimRestlet(String uriPattern, RestletEndpoint endpoint, Restlet target) throws Exception { + component.getDefaultHost().detach(target); + LOG.debug("Deattached methodRouter uriPattern: {}", uriPattern); } @Deprecated