Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-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 592101748A for ; Sun, 12 Oct 2014 13:25:00 +0000 (UTC) Received: (qmail 8307 invoked by uid 500); 12 Oct 2014 13:25:00 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 8281 invoked by uid 500); 12 Oct 2014 13:25:00 -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 8270 invoked by uid 99); 12 Oct 2014 13:25:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Oct 2014 13:25:00 +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; Sun, 12 Oct 2014 13:24:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 61B712388980; Sun, 12 Oct 2014 13:24:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1631174 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/container/OwbCDI.java main/java/org/apache/webbeans/inject/instance/InstanceImpl.java test/java/org/apache/webbeans/container/OwbCDIProviderTest.java Date: Sun, 12 Oct 2014 13:24:38 -0000 To: commits@openwebbeans.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141012132438.61B712388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Sun Oct 12 13:24:37 2014 New Revision: 1631174 URL: http://svn.apache.org/r1631174 Log: avoid NPE in InstanceImpl Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/container/OwbCDIProviderTest.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java?rev=1631174&r1=1631173&r2=1631174&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java Sun Oct 12 13:24:37 2014 @@ -26,17 +26,12 @@ import org.apache.webbeans.inject.instan import javax.enterprise.inject.Instance; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.CDI; -import javax.enterprise.inject.spi.InjectionPoint; import javax.enterprise.util.TypeLiteral; -import javax.inject.Inject; import java.lang.annotation.Annotation; import java.util.Iterator; public class OwbCDI extends CDI { - @Inject - private Instance injectionPoint; - private WebBeansContext getWebBeansContext() { return WebBeansContext.currentInstance(); @@ -47,8 +42,6 @@ public class OwbCDI extends CDI final WebBeansContext webBeansContext = getWebBeansContext(); final BeanManagerImpl bm = webBeansContext.getBeanManagerImpl(); final CreationalContextImpl> creationalContext = bm.createCreationalContext(null); - final InjectionPoint injectionPoint1 = bm.createInjectionTarget(bm.createAnnotatedType(OwbCDI.class)).getInjectionPoints().iterator().next(); - creationalContext.putInjectionPoint(injectionPoint1); return new InstanceBean(webBeansContext).create(creationalContext); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java?rev=1631174&r1=1631173&r2=1631174&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java Sun Oct 12 13:24:37 2014 @@ -163,7 +163,7 @@ public class InstanceImpl implements InjectionResolver injectionResolver = webBeansContext.getBeanManagerImpl().getInjectionResolver(); - Bean injectionPointBean = injectionPoint.getBean(); + Bean injectionPointBean = injectionPoint != null ? injectionPoint.getBean() : null; Class injectionPointClass = null; if (injectionPointBean != null) { Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/container/OwbCDIProviderTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/container/OwbCDIProviderTest.java?rev=1631174&r1=1631173&r2=1631174&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/container/OwbCDIProviderTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/container/OwbCDIProviderTest.java Sun Oct 12 13:24:37 2014 @@ -36,6 +36,7 @@ public class OwbCDIProviderTest extends assertNotNull(CDI.current()); assertNotNull(CDI.current().getBeanManager()); assertFalse(CDI.current().isUnsatisfied()); - assertTrue(CDI.current().isAmbiguous()); + assertFalse(CDI.current().isAmbiguous()); + assertNotNull(CDI.current().get()); } }