From commits-return-7133-archive-asf-public=cust-asf.ponee.io@openwebbeans.apache.org Wed Jan 31 00:38:43 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 6570A18061A for ; Wed, 31 Jan 2018 00:38:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 556B2160C54; Tue, 30 Jan 2018 23:38:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9C304160C53 for ; Wed, 31 Jan 2018 00:38:42 +0100 (CET) Received: (qmail 50518 invoked by uid 500); 30 Jan 2018 23:38:41 -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 50507 invoked by uid 99); 30 Jan 2018 23:38:41 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jan 2018 23:38:41 +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 A5B373A0168 for ; Tue, 30 Jan 2018 23:38:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1822718 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events: ProcessAnnotatedTypeImpl.java ProcessBeanAttributesImpl.java ProcessInjectionPointImpl.java ProcessObserverMethodImpl.java Date: Tue, 30 Jan 2018 23:38:38 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180130233840.A5B373A0168@svn01-us-west.apache.org> Author: struberg Date: Tue Jan 30 23:38:38 2018 New Revision: 1822718 URL: http://svn.apache.org/viewvc?rev=1822718&view=rev Log: OWB-1225 checkState in configureXxxx Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionPointImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java?rev=1822718&r1=1822717&r2=1822718&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java Tue Jan 30 23:38:38 2018 @@ -90,10 +90,10 @@ public class ProcessAnnotatedTypeImpl public void setAnnotatedType(AnnotatedType type) { checkState(); + annotatedType = type; modifiedAnnotatedType = true; - //X TODO test // reset configurator configurator = null; } @@ -114,12 +114,16 @@ public class ProcessAnnotatedTypeImpl @Override public void veto() { + checkState(); + veto = true; } @Override public AnnotatedTypeConfigurator configureAnnotatedType() { + checkState(); + if (configurator == null) { configurator = new AnnotatedTypeConfiguratorImpl(webBeansContext, annotatedType); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java?rev=1822718&r1=1822717&r2=1822718&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java Tue Jan 30 23:38:38 2018 @@ -88,6 +88,8 @@ public class ProcessBeanAttributesImpl configureBeanAttributes() { + checkState(); + if (beanAttributesConfigurator == null) { beanAttributesConfigurator = new BeanAttributesConfiguratorImpl(webBeansContext, attributes); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionPointImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionPointImpl.java?rev=1822718&r1=1822717&r2=1822718&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionPointImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionPointImpl.java Tue Jan 30 23:38:38 2018 @@ -83,6 +83,8 @@ public class ProcessInjectionPointImpl configureObserverMethod() { + checkState(); + if (observerMethodConfigurator == null) { this.observerMethodConfigurator = new ObserverMethodConfiguratorImpl(webBeansContext, extension, observerMethod);