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<X>
public void setAnnotatedType(AnnotatedType<X> type)
{
checkState();
+
annotatedType = type;
modifiedAnnotatedType = true;
- //X TODO test
// reset configurator
configurator = null;
}
@@ -114,12 +114,16 @@ public class ProcessAnnotatedTypeImpl<X>
@Override
public void veto()
{
+ checkState();
+
veto = true;
}
@Override
public AnnotatedTypeConfigurator<X> 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<T
@Override
public BeanAttributesConfigurator<T> 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<T
@Override
public InjectionPointConfigurator configureInjectionPoint()
{
+ checkState();
+
if (injectionPointConfigurator == null)
{
this.injectionPointConfigurator = new
InjectionPointConfiguratorImpl(injectionPoint);
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java?rev=1822718&r1=1822717&r2=1822718&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java
Tue Jan 30 23:38:38 2018
@@ -77,6 +77,8 @@ public class ProcessObserverMethodImpl<T
@Override
public ObserverMethodConfigurator<T> configureObserverMethod()
{
+ checkState();
+
if (observerMethodConfigurator == null)
{
this.observerMethodConfigurator = new
ObserverMethodConfiguratorImpl(webBeansContext, extension, observerMethod);