svn commit: r1199216 - in /tiles/framework/trunk/tiles-request/tiles-request-servlet/src: main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java

[mck]

Author: mck
Date: Tue Nov  8 12:25:24 2011
New Revision: 1199216

URL: http://svn.apache.org/viewvc?rev=1199216&view=rev
Log:
TREQ-10 - NPE while reading the session scope when no session has been created

Modified:
    
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java
    
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java

Modified: 
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java?rev=1199216&r1=1199215&r2=1199216&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java
 (original)
+++ 
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java
 Tue Nov  8 12:25:24 2011
@@ -21,6 +21,7 @@
 package org.apache.tiles.request.servlet.extractor;
 
 import java.util.Enumeration;
+import java.util.Collections;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -68,7 +69,7 @@ public class SessionScopeExtractor imple
         if (session != null) {
             return session.getAttributeNames();
         }
-        return null;
+        return Collections.enumeration(Collections.<String>emptySet());
     }
 
     @Override

Modified: 
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java?rev=1199216&r1=1199215&r2=1199216&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java
 (original)
+++ 
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java
 Tue Nov  8 12:25:24 2011
@@ -114,7 +114,9 @@ public class SessionScopeExtractorTest {
         expect(request.getSession(false)).andReturn(null);
 
         replay(request, session);
-        assertNull(extractor.getKeys());
+        Enumeration<String> keys = extractor.getKeys();
+        assertNotNull(keys);
+        assertFalse(keys.hasMoreElements());
         verify(request, session);
     }