From a7a97316e7456c3b1a2b756269d5c71b75ddacf1 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 5 Aug 2009 22:01:46 +0000 Subject: [PATCH] turned requestedSessionId into a settable property --- .../springframework/mock/web/MockHttpServletRequest.java | 9 +++++++-- .../springframework/mock/web/MockHttpServletRequest.java | 9 +++++++-- .../springframework/mock/web/MockHttpServletRequest.java | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java index 85dd8742f2..ca20451f66 100644 --- a/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/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) { diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java b/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java index 53cc174c09..26f7171b58 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/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) { diff --git a/org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java b/org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java index 53cc174c09..26f7171b58 100644 --- a/org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/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) {