You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/04/17 00:27:56 UTC
svn commit: r1094072 -
/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/security/SecurityAwareViewHandler.java
Author: gpetracek
Date: Sat Apr 16 22:27:55 2011
New Revision: 1094072
URL: http://svn.apache.org/viewvc?rev=1094072&view=rev
Log:
EXTCDI-167 cleanup
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/security/SecurityAwareViewHandler.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/security/SecurityAwareViewHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/security/SecurityAwareViewHandler.java?rev=1094072&r1=1094071&r2=1094072&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/security/SecurityAwareViewHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/security/SecurityAwareViewHandler.java Sat Apr 16 22:27:55 2011
@@ -64,9 +64,14 @@ public class SecurityAwareViewHandler
//workaround for PreDestroyViewMapEvent which would be caused by the security check
deactivatePreDestroyViewMapEvent(facesContext);
- newViewRoot = super.createView(facesContext, viewId);
-
- activatePreDestroyViewMapEvent(facesContext);
+ try
+ {
+ newViewRoot = super.createView(facesContext, viewId);
+ }
+ finally
+ {
+ activatePreDestroyViewMapEvent(facesContext);
+ }
if(viewMap != null)
{