myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch master updated: cleanup
Date Fri, 16 Aug 2019 16:55:28 GMT
This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new cbe1b11  cleanup
cbe1b11 is described below

commit cbe1b11406185e70280d580f93b06fba16784f05
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Fri Aug 16 18:55:22 2019 +0200

    cleanup
---
 .../java/org/apache/myfaces/config/FacesConfigurator.java    | 12 ++++++------
 .../org/apache/myfaces/webapp/AbstractFacesInitializer.java  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
index 5632c04..3e99dc6 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -144,6 +144,7 @@ import org.apache.myfaces.view.facelets.el.ELText;
 import org.apache.myfaces.view.facelets.impl.FaceletCacheFactoryImpl;
 import org.apache.myfaces.view.facelets.tag.jsf.TagHandlerDelegateFactoryImpl;
 import org.apache.myfaces.view.facelets.tag.ui.DebugPhaseListener;
+import org.apache.myfaces.webapp.AbstractFacesInitializer;
 
 /**
  * Configures everything for a given context. The FacesConfigurator is independent of the
concrete implementations that
@@ -180,8 +181,6 @@ public class FacesConfigurator
             SearchExpressionContextFactoryImpl.class.getName();
     private static final String DEFAULT_FACES_CONFIG = "/WEB-INF/faces-config.xml";
 
-    private static final String INJECTED_BEAN_STORAGE_KEY = "org.apache.myfaces.spi.BEAN_ENTRY_STORAGE";
-
     /**
      * Set this attribute if the current configuration requires enable window mode
      */
@@ -213,9 +212,10 @@ public class FacesConfigurator
         // In dev mode a new Faces Configurator is created for every request so only
         // create a new bean storage list if we don't already have one which will be
         // the case first time through during init.
-        if (_externalContext.getApplicationMap().get(INJECTED_BEAN_STORAGE_KEY) == null)

+        if (_externalContext.getApplicationMap().get(AbstractFacesInitializer.INJECTED_BEAN_STORAGE_KEY)
== null)
         {
-            _externalContext.getApplicationMap().put(INJECTED_BEAN_STORAGE_KEY, new CopyOnWriteArrayList());
+            _externalContext.getApplicationMap().put(AbstractFacesInitializer.INJECTED_BEAN_STORAGE_KEY,
+                    new CopyOnWriteArrayList());
         }
         
         _myfacesConfig = MyfacesConfig.getCurrentInstance(_externalContext);
@@ -824,8 +824,8 @@ public class FacesConfigurator
                     _callInjectAndPostConstruct(innerInstance);
                 }
             }
-            List<BeanEntry> injectedBeanStorage =
-                    (List<BeanEntry>)_externalContext.getApplicationMap().get(INJECTED_BEAN_STORAGE_KEY);
+            List<BeanEntry> injectedBeanStorage = (List<BeanEntry>) _externalContext.getApplicationMap().get(
+                            AbstractFacesInitializer.INJECTED_BEAN_STORAGE_KEY);
 
             Object creationMetaData = getInjectionProvider().inject(instance);
 
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 4a6ffb6..07495e9 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
@@ -86,7 +86,7 @@ public abstract class AbstractFacesInitializer implements FacesInitializer
     private static final String CDI_SERVLET_CONTEXT_BEAN_MANAGER_ATTRIBUTE = 
         "javax.enterprise.inject.spi.BeanManager";
 
-    private static final String INJECTED_BEAN_STORAGE_KEY = "org.apache.myfaces.spi.BEAN_ENTRY_STORAGE";
+    public static final String INJECTED_BEAN_STORAGE_KEY = "org.apache.myfaces.spi.BEAN_ENTRY_STORAGE";
 
     /**
      * Performs all necessary initialization tasks like configuring this JSF


Mime
View raw message