commit 95f8b2e0a574ccf1b099a3366a4e4138fe965d43
author Michael Semb Wever <mck@apache.org> Tue Nov 08 12:25:24 2011 +0000
committer Michael Semb Wever <mck@apache.org> Tue Nov 08 12:25:24 2011 +0000
tree 77d0c28b4f0e80870871af638c849072964b445d
parent ce8b8e1effab41d50e490d89890a8cace1381157

TREQ-10 - NPE while reading the session scope when no session has been created


git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/trunk/tiles-request@1199216 13f79535-47bb-0310-9956-ffa450edef68

tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java

diff --git a/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java b/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java
index dbc4a48..6d49743 100644
--- a/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java
+++ b/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java
@@ -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 @@
         if (session != null) {
             return session.getAttributeNames();
         }
-        return null;
+        return Collections.enumeration(Collections.<String>emptySet());
     }
 
     @Override

tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java

diff --git a/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java b/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java
index 599979c..8be27b4 100644
--- a/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java
+++ b/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java
@@ -114,7 +114,9 @@
         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);
     }