You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sl...@apache.org on 2008/11/13 00:23:12 UTC

svn commit: r713556 - in /myfaces/core/branches/2_0_0: api/src/main/java/javax/faces/context/ExternalContext.java impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java

Author: slessard
Date: Wed Nov 12 15:23:11 2008
New Revision: 713556

URL: http://svn.apache.org/viewvc?rev=713556&view=rev
Log:
MYFACES-1941 - Implement ExternalContext.invalidateSession

Modified:
    myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ExternalContext.java
    myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java

Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ExternalContext.java?rev=713556&r1=713555&r2=713556&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ExternalContext.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ExternalContext.java Wed Nov 12 15:23:11 2008
@@ -268,8 +268,7 @@
      */
     public void invalidateSession()
     {
-        // TODO: JSF 2.0 #30
-        // VALIDATE: Should this be asbtract or throws UnsupportedOperationException? Check with the EG
+        throw new UnsupportedOperationException();
     }
 
     /**

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java?rev=713556&r1=713555&r2=713556&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java Wed Nov 12 15:23:11 2008
@@ -40,6 +40,7 @@
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.myfaces.context.ReleaseableExternalContext;
 import org.apache.myfaces.util.EnumerationIterator;
@@ -430,6 +431,17 @@
     }
 
     @Override
+    public void invalidateSession()
+    {
+        HttpSession session = (HttpSession) getSession(false);
+        
+        if (session != null)
+        {
+            session.invalidate();
+        }
+    }
+
+    @Override
     public void log(final String message)
     {
         checkNull(message, "message");