You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2019/05/30 15:52:18 UTC

[myfaces] branch master updated: some SPI

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 9b9da5b  some SPI
9b9da5b is described below

commit 9b9da5b000e626f1584bb90c6e51e6ccc1a24877
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Thu May 30 17:52:17 2019 +0200

    some SPI
---
 .../java/org/apache/myfaces/cdi/FacesScopeContextImpl.java   | 12 +++++++++---
 .../myfaces/cdi/view/ViewTransientScopeContextImpl.java      | 10 ++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/cdi/FacesScopeContextImpl.java b/impl/src/main/java/org/apache/myfaces/cdi/FacesScopeContextImpl.java
index 39c4a3d..446ddf2 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/FacesScopeContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/FacesScopeContextImpl.java
@@ -42,7 +42,13 @@ public class FacesScopeContextImpl implements Context
     {
         this.beanManager = beanManager;
     }
-    
+
+    // SPI
+    protected BeanManager getBeanManager()
+    {
+        return beanManager;
+    }
+
     protected FacesScopeBeanHolder getFacesScopeBeanHolder()
     {
         return getFacesScopeBeanHolder(FacesContext.getCurrentInstance());
@@ -68,11 +74,11 @@ public class FacesScopeContextImpl implements Context
 
         if (createIfNotExist)
         {
-            return getFacesScopeBeanHolder(facesContext).getContextualStorage(beanManager, facesContext);
+            return getFacesScopeBeanHolder(facesContext).getContextualStorage(getBeanManager(), facesContext);
         }
         else
         {
-            return getFacesScopeBeanHolder(facesContext).getContextualStorageNoCreate(beanManager, facesContext);
+            return getFacesScopeBeanHolder(facesContext).getContextualStorageNoCreate(getBeanManager(), facesContext);
         }
     }
 
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeContextImpl.java b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeContextImpl.java
index 227e5b6..159584b 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeContextImpl.java
@@ -44,6 +44,12 @@ public class ViewTransientScopeContextImpl implements Context
         this.beanManager = beanManager;
     }
     
+    // SPI
+    protected BeanManager getBeanManager()
+    {
+        return beanManager;
+    }
+    
     protected ViewTransientScopeBeanHolder getViewTransientScopeBeanHolder()
     {
         return getViewTransientScopeBeanHolder(FacesContext.getCurrentInstance());
@@ -69,12 +75,12 @@ public class ViewTransientScopeContextImpl implements Context
 
         if (createIfNotExist)
         {
-            return getViewTransientScopeBeanHolder(facesContext).getContextualStorage(beanManager, facesContext);
+            return getViewTransientScopeBeanHolder(facesContext).getContextualStorage(getBeanManager(), facesContext);
         }
         else
         {
             return getViewTransientScopeBeanHolder(facesContext).getContextualStorageNoCreate(
-                    beanManager, facesContext);
+                    getBeanManager(), facesContext);
         }
     }