Return-Path: Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: (qmail 33757 invoked from network); 27 Sep 2010 16:16:53 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 27 Sep 2010 16:16:53 -0000 Received: (qmail 57688 invoked by uid 500); 27 Sep 2010 16:16:53 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 57653 invoked by uid 500); 27 Sep 2010 16:16:53 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 57645 invoked by uid 99); 27 Sep 2010 16:16:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Sep 2010 16:16:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 27 Sep 2010 16:16:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C0E2B23889E1; Mon, 27 Sep 2010 16:16:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1001801 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: container/BeanManagerImpl.java lifecycle/AbstractLifeCycle.java Date: Mon, 27 Sep 2010 16:16:28 -0000 To: commits@openwebbeans.apache.org From: gerdogdu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100927161628.C0E2B23889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gerdogdu Date: Mon Sep 27 16:16:28 2010 New Revision: 1001801 URL: http://svn.apache.org/viewvc?rev=1001801&view=rev Log: Cleaning of maps in BeanManager to help GC Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1001801&r1=1001800&r2=1001801&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Mon Sep 27 16:16:28 2010 @@ -76,7 +76,6 @@ import org.apache.webbeans.exception.inj import org.apache.webbeans.intercept.InterceptorComparator; import org.apache.webbeans.intercept.WebBeansInterceptorConfig; import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor; -import org.apache.webbeans.logger.WebBeansLogger; import org.apache.webbeans.plugins.OpenWebBeansJmsPlugin; import org.apache.webbeans.plugins.PluginLoader; import org.apache.webbeans.portable.AnnotatedElementFactory; @@ -170,7 +169,7 @@ public class BeanManagerImpl implements private AnnotatedElementFactory annotatedElementFactory; - private WebBeansLogger logger = WebBeansLogger.getLogger(BeanManagerImpl.class); + //private WebBeansLogger logger = WebBeansLogger.getLogger(BeanManagerImpl.class); /** * Creates a new {@link BeanManager} instance. @@ -1095,4 +1094,22 @@ public class BeanManagerImpl implements { return additionalScopes; } + + public void clear() + { + this.additionalAnnotatedTypes.clear(); + this.additionalDecoratorClasses.clear(); + this.additionalInterceptorClasses.clear(); + this.additionalQualifiers.clear(); + this.additionalScopes.clear(); + this.cacheProxies.clear(); + this.contextMap.clear(); + this.deploymentBeans.clear(); + this.errorStack.clear(); + this.injectionTargetForJavaEeComponents.clear(); + this.injectionTargetWrappers.clear(); + this.passivationBeans.clear(); + this.webBeansDecorators.clear(); + this.webBeansInterceptors.clear(); + } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java?rev=1001801&r1=1001800&r2=1001801&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java Mon Sep 27 16:16:28 2010 @@ -167,8 +167,11 @@ public abstract class AbstractLifeCycle //After Stop afterStopApplication(endObject); - - //Clear singleton list + + // Clear BeanManager + this.beanManager.clear(); + + // Clear singleton list WebBeansFinder.clearInstances(WebBeansUtil.getCurrentClassLoader()); }