You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2013/08/13 01:22:12 UTC
svn commit: r1513292 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces:
cdi/impl/CDIManagedBeanHandlerImpl.java cdi/view/ViewScopeBeanHolder.java
flow/cdi/FlowScopeBeanHolder.java
Author: lu4242
Date: Mon Aug 12 23:22:12 2013
New Revision: 1513292
URL: http://svn.apache.org/r1513292
Log:
static methods cannot be proxied properly on CDI - move the methods to somewhere else
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIManagedBeanHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIManagedBeanHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIManagedBeanHandlerImpl.java?rev=1513292&r1=1513291&r2=1513292&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIManagedBeanHandlerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIManagedBeanHandlerImpl.java Mon Aug 12 23:22:12 2013
@@ -96,14 +96,27 @@ public class CDIManagedBeanHandlerImpl e
FacesContext facesContext = FacesContext.getCurrentInstance();
if (facesContext != null)
{
- if (ViewScopeBeanHolder.isViewScopeBeanHolderCreated(facesContext))
+ if (isViewScopeBeanHolderCreated(facesContext))
{
getViewScopeBeanHolder().destroyBeans();
}
- if (FlowScopeBeanHolder.isFlowScopeBeanHolderCreated(facesContext))
+ if (isFlowScopeBeanHolderCreated(facesContext))
{
getFlowScopeBeanHolder().destroyBeans();
}
}
}
+
+ private boolean isViewScopeBeanHolderCreated(FacesContext facesContext)
+ {
+ return facesContext.getExternalContext().
+ getSessionMap().containsKey(ViewScopeBeanHolder.VIEW_SCOPE_PREFIX_KEY);
+ }
+
+
+ private boolean isFlowScopeBeanHolderCreated(FacesContext facesContext)
+ {
+ return facesContext.getExternalContext().
+ getSessionMap().containsKey(FlowScopeBeanHolder.FLOW_SCOPE_PREFIX_KEY);
+ }
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java?rev=1513292&r1=1513291&r2=1513292&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java Mon Aug 12 23:22:12 2013
@@ -60,12 +60,6 @@ public class ViewScopeBeanHolder impleme
1);
}
- public static final boolean isViewScopeBeanHolderCreated(FacesContext facesContext)
- {
- return facesContext.getExternalContext().
- getSessionMap().containsKey(VIEW_SCOPE_PREFIX_KEY);
- }
-
/**
* This method will return the ViewScopeContextualStorage or create a new one
* if no one is yet assigned to the current windowId.
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java?rev=1513292&r1=1513291&r2=1513292&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java Mon Aug 12 23:22:12 2013
@@ -74,12 +74,6 @@ public class FlowScopeBeanHolder impleme
1);
}
- public static final boolean isFlowScopeBeanHolderCreated(FacesContext facesContext)
- {
- return facesContext.getExternalContext().
- getSessionMap().containsKey(FLOW_SCOPE_PREFIX_KEY);
- }
-
/**
* This method will return the ContextualStorage or create a new one
* if no one is yet assigned to the current flowClientWindowId.