Return-Path: Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: (qmail 38253 invoked from network); 22 Jan 2010 15:27:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Jan 2010 15:27:48 -0000 Received: (qmail 59744 invoked by uid 500); 22 Jan 2010 15:27:48 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 59715 invoked by uid 500); 22 Jan 2010 15:27:47 -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 59705 invoked by uid 99); 22 Jan 2010 15:27:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jan 2010 15:27:47 +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; Fri, 22 Jan 2010 15:27:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A7FE223889F7; Fri, 22 Jan 2010 15:27:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r902117 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Date: Fri, 22 Jan 2010 15:27:26 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100122152726.A7FE223889F7@eris.apache.org> Author: struberg Date: Fri Jan 22 15:27:26 2010 New Revision: 902117 URL: http://svn.apache.org/viewvc?rev=902117&view=rev Log: OWB-247 in case of Reception.ALWAYS: only create a contextual reference if no contextual instance already exists Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java?rev=902117&r1=902116&r2=902117&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Fri Jan 22 15:27:26 2010 @@ -189,21 +189,15 @@ creationalContext = manager.createCreationalContext(specializedComponent); - if(this.ifExist) - { - object = context.get(specializedComponent); - } - else + // lookup the contextual instance if one already exists + object = context.get(specializedComponent); + + if(object == null && !this.ifExist) { + // on Reception.ALWAYS we must get a contextual reference if we didn't find the contextual instance object = manager.getReference(specializedComponent, specializedComponent.getBeanClass(), creationalContext); } - - if (this.ifExist && object == null) - { - return; - } - if (object != null) { //Invoke Method