Return-Path: X-Original-To: apmail-incubator-deltaspike-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-deltaspike-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D4F059B32 for ; Fri, 23 Mar 2012 03:00:40 +0000 (UTC) Received: (qmail 8711 invoked by uid 500); 23 Mar 2012 03:00:40 -0000 Delivered-To: apmail-incubator-deltaspike-commits-archive@incubator.apache.org Received: (qmail 8686 invoked by uid 500); 23 Mar 2012 03:00:40 -0000 Mailing-List: contact deltaspike-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: deltaspike-dev@incubator.apache.org Delivered-To: mailing list deltaspike-commits@incubator.apache.org Received: (qmail 8671 invoked by uid 99); 23 Mar 2012 03:00:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Mar 2012 03:00:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BC26788A2; Fri, 23 Mar 2012 03:00:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gpetracek@apache.org To: deltaspike-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: DELTASPIKE-69 cleanup before shutdown Message-Id: <20120323030039.BC26788A2@tyr.zones.apache.org> Date: Fri, 23 Mar 2012 03:00:39 +0000 (UTC) Updated Branches: refs/heads/master 4b2fe6550 -> cfecbbc54 DELTASPIKE-69 cleanup before shutdown Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/cfecbbc5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/cfecbbc5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/cfecbbc5 Branch: refs/heads/master Commit: cfecbbc54ee64f22c30475c99677858a7262d3de Parents: 4b2fe65 Author: gpetracek Authored: Fri Mar 23 03:53:30 2012 +0100 Committer: gpetracek Committed: Fri Mar 23 03:57:45 2012 +0100 ---------------------------------------------------------------------- .../security/impl/SecurityExtension.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/cfecbbc5/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/SecurityExtension.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/SecurityExtension.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/SecurityExtension.java index 15c4094..3d9db81 100644 --- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/SecurityExtension.java +++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/SecurityExtension.java @@ -33,6 +33,7 @@ import javax.enterprise.inject.spi.AnnotatedMethod; import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.BeforeBeanDiscovery; +import javax.enterprise.inject.spi.BeforeShutdown; import javax.enterprise.inject.spi.Extension; import javax.enterprise.inject.spi.ProcessAnnotatedType; import javax.enterprise.inject.spi.ProcessSessionBean; @@ -70,6 +71,12 @@ public class SecurityExtension implements Extension, Deactivatable return securityMetaDataStorage; } + protected static void removeMetaDataStorage() + { + ClassLoader classLoader = ClassUtils.getClassLoader(null); + SECURITY_METADATA_STORAGE_MAPPING.remove(classLoader); + } + protected void init(@Observes BeforeBeanDiscovery afterBeanDiscovery) { initActivation(); @@ -205,6 +212,11 @@ public class SecurityExtension implements Extension, Deactivatable metaDataStorage.resetSecuredTypes(); } + protected void cleanup(@Observes BeforeShutdown beforeShutdown) + { + removeMetaDataStorage(); + } + /** * Registers the specified authorizer method (i.e. a method annotated with * the @Secures annotation)