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 2017/08/24 22:01:40 UTC

svn commit: r1806097 - /myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java

Author: tandraschko
Date: Thu Aug 24 22:01:40 2017
New Revision: 1806097

URL: http://svn.apache.org/viewvc?rev=1806097&view=rev
Log:
MYFACES-4135 Replace NullEnumeration by Collections#emptyEnumeration

Modified:
    myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java

Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java?rev=1806097&r1=1806096&r2=1806097&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java Thu Aug 24 22:01:40 2017
@@ -18,13 +18,13 @@
  */
 package org.apache.myfaces.context.servlet;
 
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import org.apache.myfaces.shared.util.NullEnumeration;
 import org.apache.myfaces.util.AbstractThreadSafeAttributeMap;
 
 
@@ -71,7 +71,7 @@ public final class SessionMap extends Ab
     protected Enumeration<String> getAttributeNames()
     {
         final HttpSession httpSession = _getSession();
-        return (httpSession == null) ? NullEnumeration.instance() : httpSession.getAttributeNames();
+        return (httpSession == null) ? Collections.emptyEnumeration() : httpSession.getAttributeNames();
     }
 
     @Override