turned requestedSessionId into a settable property

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1701 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java

@@ -159,6 +159,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
 
 	private Principal userPrincipal;
 
+	private String requestedSessionId;
+
 	private String requestURI;
 
 	private String servletPath = "";
@@ -761,9 +763,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		return this.userPrincipal;
 	}
 
+	public void setRequestedSessionId(String requestedSessionId) {
+		this.requestedSessionId = requestedSessionId;
+	}
+
 	public String getRequestedSessionId() {
-		HttpSession session = getSession();
-		return (session != null ? session.getId() : null);
+		return this.requestedSessionId;
 	}
 
 	public void setRequestURI(String requestURI) {

org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java

@@ -159,6 +159,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
 
 	private Principal userPrincipal;
 
+	private String requestedSessionId;
+
 	private String requestURI;
 
 	private String servletPath = "";
@@ -761,9 +763,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		return this.userPrincipal;
 	}
 
+	public void setRequestedSessionId(String requestedSessionId) {
+		this.requestedSessionId = requestedSessionId;
+	}
+
 	public String getRequestedSessionId() {
-		HttpSession session = getSession();
-		return (session != null ? session.getId() : null);
+		return this.requestedSessionId;
 	}
 
 	public void setRequestURI(String requestURI) {

org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java

@@ -159,6 +159,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
 
 	private Principal userPrincipal;
 
+	private String requestedSessionId;
+
 	private String requestURI;
 
 	private String servletPath = "";
@@ -761,9 +763,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		return this.userPrincipal;
 	}
 
+	public void setRequestedSessionId(String requestedSessionId) {
+		this.requestedSessionId = requestedSessionId;
+	}
+
 	public String getRequestedSessionId() {
-		HttpSession session = getSession();
-		return (session != null ? session.getId() : null);
+		return this.requestedSessionId;
 	}
 
 	public void setRequestURI(String requestURI) {