From commits-return-7295-archive-asf-public=cust-asf.ponee.io@openwebbeans.apache.org Sat Apr 14 22:12:26 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 7F79B18064D for ; Sat, 14 Apr 2018 22:12:25 +0200 (CEST) Received: (qmail 4024 invoked by uid 500); 14 Apr 2018 20:12:24 -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 4013 invoked by uid 99); 14 Apr 2018 20:12:24 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Apr 2018 20:12:24 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 8B5BA3A00E7 for ; Sat, 14 Apr 2018 20:12:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1829166 - in /openwebbeans/branches/owb_1.7.x: ./ webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ProducerBean.java Date: Sat, 14 Apr 2018 20:12:22 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180414201223.8B5BA3A00E7@svn01-us-west.apache.org> Author: struberg Date: Sat Apr 14 20:12:22 2018 New Revision: 1829166 URL: http://svn.apache.org/viewvc?rev=1829166&view=rev Log: OWB-1213 fix NPE when scanning for self-intercepting bean Did happen on producermethods which return a class with a private ct. ported back from OWB-2.0.x Modified: openwebbeans/branches/owb_1.7.x/ (props changed) openwebbeans/branches/owb_1.7.x/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java openwebbeans/branches/owb_1.7.x/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ProducerBean.java Propchange: openwebbeans/branches/owb_1.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 14 20:12:22 2018 @@ -1,2 +1,2 @@ /openwebbeans/branches/owb_1.2.x:1640945,1641609,1641684 -/openwebbeans/trunk:1803385 +/openwebbeans/trunk:1803385,1805243 Modified: openwebbeans/branches/owb_1.7.x/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.7.x/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java?rev=1829166&r1=1829165&r2=1829166&view=diff ============================================================================== --- openwebbeans/branches/owb_1.7.x/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java (original) +++ openwebbeans/branches/owb_1.7.x/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java Sat Apr 14 20:12:22 2018 @@ -326,7 +326,13 @@ public class InterceptorResolutionServic private SelfInterceptorBean resolveSelfInterceptorBean(AnnotatedType annotatedType) { BeanAttributesImpl beanAttributes = BeanAttributesBuilder.forContext(webBeansContext).newBeanAttibutes(annotatedType).build(); - SelfInterceptorBeanBuildersibb = new SelfInterceptorBeanBuilder(webBeansContext, annotatedType, beanAttributes); + if (beanAttributes == null) + { + // might happen if a proxying rule defines that this is not a valid bean type. + return null; + } + + SelfInterceptorBeanBuilder sibb = new SelfInterceptorBeanBuilder<>(webBeansContext, annotatedType, beanAttributes); sibb.defineSelfInterceptorRules(); if (!sibb.isInterceptorEnabled()) { Modified: openwebbeans/branches/owb_1.7.x/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ProducerBean.java URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.7.x/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ProducerBean.java?rev=1829166&r1=1829165&r2=1829166&view=diff ============================================================================== --- openwebbeans/branches/owb_1.7.x/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ProducerBean.java (original) +++ openwebbeans/branches/owb_1.7.x/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ProducerBean.java Sat Apr 14 20:12:22 2018 @@ -20,6 +20,7 @@ package org.apache.webbeans.test.produce import javax.enterprise.inject.Produces; import javax.inject.Named; +import java.net.URI; public class ProducerBean { @@ -58,4 +59,10 @@ public class ProducerBean { public boolean isName6() { return true; } + + @Produces + public URI createUri() + { + return URI.create("http://invalid.invalid"); + } }