From commits-return-7829-archive-asf-public=cust-asf.ponee.io@openwebbeans.apache.org Tue Nov 27 11:37:18 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 C61F7180670 for ; Tue, 27 Nov 2018 11:37:17 +0100 (CET) Received: (qmail 40587 invoked by uid 500); 27 Nov 2018 10:37:17 -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 40576 invoked by uid 99); 27 Nov 2018 10:37:16 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Nov 2018 10:37:16 +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 53A1B3A0826 for ; Tue, 27 Nov 2018 10:37:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1847526 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Date: Tue, 27 Nov 2018 10:37:15 -0000 To: commits@openwebbeans.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20181127103716.53A1B3A0826@svn01-us-west.apache.org> Author: rmannibucau Date: Tue Nov 27 10:37:15 2018 New Revision: 1847526 URL: http://svn.apache.org/viewvc?rev=1847526&view=rev Log: same workaround as in inspectDefinitionErrorStack for inspectDeploymentErrorStack Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1847526&r1=1847525&r2=1847526&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Tue Nov 27 10:37:15 2018 @@ -110,6 +110,7 @@ import javax.enterprise.inject.spi.BeanA import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.enterprise.inject.spi.BeforeShutdown; +import javax.enterprise.inject.spi.DefinitionException; import javax.enterprise.inject.spi.DeploymentException; import javax.enterprise.inject.spi.Extension; import javax.enterprise.inject.spi.InjectionPoint; @@ -1127,7 +1128,16 @@ public final class WebBeansUtil if(stack.hasErrors()) { stack.logErrors(); - throw new WebBeansDeploymentException(logMessage); + + // just because of some TCK and spec insanity v2...reversed compared to previous one + if (stack.iterator().next() instanceof DefinitionException) + { + throw new WebBeansConfigurationException(logMessage); + } + else + { + throw new WebBeansDeploymentException(logMessage); + } } } finally