Return-Path: Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: (qmail 57214 invoked from network); 27 Jul 2010 20:39:10 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 27 Jul 2010 20:39:10 -0000 Received: (qmail 24944 invoked by uid 500); 27 Jul 2010 20:39:10 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 24907 invoked by uid 500); 27 Jul 2010 20:39:10 -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 24899 invoked by uid 99); 27 Jul 2010 20:39:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jul 2010 20:39:10 +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; Tue, 27 Jul 2010 20:39:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2461C23889BF; Tue, 27 Jul 2010 20:37:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r979859 - /openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java Date: Tue, 27 Jul 2010 20:37:53 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100727203753.2461C23889BF@eris.apache.org> Author: struberg Date: Tue Jul 27 20:37:52 2010 New Revision: 979859 URL: http://svn.apache.org/viewvc?rev=979859&view=rev Log: OWB-425 remove duplicate checks Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java?rev=979859&r1=979858&r2=979859&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java Tue Jul 27 20:37:52 2010 @@ -162,34 +162,30 @@ public class WebContextsService extends @Override public void endContext(Class scopeType, Object endParameters) { - if(supportsContext(scopeType)) + if(scopeType.equals(RequestScoped.class)) { - if(scopeType.equals(RequestScoped.class)) - { - destroyRequestContext((ServletRequestEvent)endParameters); - } - else if(scopeType.equals(SessionScoped.class)) - { - destroySessionContext((HttpSession)endParameters); - } - else if(scopeType.equals(ApplicationScoped.class)) - { - destroyApplicationContext((ServletContext)endParameters); - } - else if(scopeType.equals(ConversationScoped.class)) - { - destroyConversationContext(); - } - else if(scopeType.equals(Dependent.class)) - { - //Do nothing - } - else - { - destroySingletonContext((ServletContext)endParameters); - } + destroyRequestContext((ServletRequestEvent)endParameters); + } + else if(scopeType.equals(SessionScoped.class)) + { + destroySessionContext((HttpSession)endParameters); + } + else if(scopeType.equals(ApplicationScoped.class)) + { + destroyApplicationContext((ServletContext)endParameters); + } + else if(supportsConversation && scopeType.equals(ConversationScoped.class)) + { + destroyConversationContext(); + } + else if(scopeType.equals(Dependent.class)) + { + //Do nothing + } + else if (scopeType.equals(Singleton.class)) + { + destroySingletonContext((ServletContext)endParameters); } - } /** @@ -198,34 +194,31 @@ public class WebContextsService extends @Override public Context getCurrentContext(Class scopeType) { - if(supportsContext(scopeType)) + if(scopeType.equals(RequestScoped.class)) { - if(scopeType.equals(RequestScoped.class)) - { - return getRequestContext(); - } - else if(scopeType.equals(SessionScoped.class)) - { - return getSessionContext(); - } - else if(scopeType.equals(ApplicationScoped.class)) - { - return getApplicationContext(); - } - else if(scopeType.equals(ConversationScoped.class)) - { - return getConversationContext(); - } - else if(scopeType.equals(Dependent.class)) - { - return dependentContext; - } - else - { - return getSingletonContext(); - } + return getRequestContext(); } - + else if(scopeType.equals(SessionScoped.class)) + { + return getSessionContext(); + } + else if(scopeType.equals(ApplicationScoped.class)) + { + return getApplicationContext(); + } + else if(supportsConversation && scopeType.equals(ConversationScoped.class)) + { + return getConversationContext(); + } + else if(scopeType.equals(Dependent.class)) + { + return dependentContext; + } + else if (scopeType.equals(Singleton.class)) + { + return getSingletonContext(); + } + return null; } @@ -235,34 +228,30 @@ public class WebContextsService extends @Override public void startContext(Class scopeType, Object startParameter) throws ContextException { - if(supportsContext(scopeType)) + if(scopeType.equals(RequestScoped.class)) { - if(scopeType.equals(RequestScoped.class)) - { - initRequestContext((ServletRequestEvent)startParameter); - } - else if(scopeType.equals(SessionScoped.class)) - { - initSessionContext((HttpSession)startParameter); - } - else if(scopeType.equals(ApplicationScoped.class)) - { - initApplicationContext((ServletContext)startParameter); - } - else if(scopeType.equals(ConversationScoped.class)) - { - initConversationContext((ConversationContext)startParameter); - } - else if(scopeType.equals(Dependent.class)) - { - //Do nothing - } - else - { - initSingletonContext((ServletContext)startParameter); - } + initRequestContext((ServletRequestEvent)startParameter); + } + else if(scopeType.equals(SessionScoped.class)) + { + initSessionContext((HttpSession)startParameter); + } + else if(scopeType.equals(ApplicationScoped.class)) + { + initApplicationContext((ServletContext)startParameter); + } + else if(supportsConversation && scopeType.equals(ConversationScoped.class)) + { + initConversationContext((ConversationContext)startParameter); + } + else if(scopeType.equals(Dependent.class)) + { + //Do nothing + } + else if (scopeType.equals(Singleton.class)) + { + initSingletonContext((ServletContext)startParameter); } - } /**