commit d9836c13244911524de27735f84f379064792906
author Thomas Andraschko <tandraschko@apache.org> Sat Jul 27 17:38:20 2019 +0200
committer Thomas Andraschko <tandraschko@apache.org> Sat Jul 27 17:38:20 2019 +0200
tree 8fd69abfb979aed2578da9e8fa6e19e1d072a414
parent 6615aad99e7578ca9ce2bee042f23be5551ca30f

make CdiAnnotationProviderExtension optional again

impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java

diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
index ec560ee..eb61770 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
@@ -145,7 +145,8 @@
         if (MyfacesConfig.getCurrentInstance(ctx).isUseCdiForAnnotationScanning())
         {
             BeanManager beanManager = CDIUtils.getBeanManager(ctx);
-            CdiAnnotationProviderExtension extension = CDIUtils.get(beanManager, CdiAnnotationProviderExtension.class, true);
+            CdiAnnotationProviderExtension extension = CDIUtils.get(beanManager,
+                    CdiAnnotationProviderExtension.class, true);
             if (extension != null)
             {
                 return extension.getMap();

impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java

diff --git a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
index 4f2611a..ffb09d5 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
@@ -269,7 +269,8 @@
         if (ExternalSpecifications.isCDIAvailable(externalContext))
         {
             BeanManager beanManager = CDIUtils.getBeanManager(externalContext);
-            CdiAnnotationProviderExtension extension = CDIUtils.get(beanManager, CdiAnnotationProviderExtension.class, true);
+            CdiAnnotationProviderExtension extension = CDIUtils.get(beanManager,
+                    CdiAnnotationProviderExtension.class, true);
             if (extension != null)
             {
                 extension.release();