[GH-2284] fix commitSession() called multiple times in requestDispatcher.include

Author: Laurent SCHOELENS

spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java

@@ -204,6 +204,8 @@ private final class SessionRepositoryRequestWrapper extends HttpServletRequestWr
 
 		private boolean requestedSessionInvalidated;
 
+		private boolean hasCommitedInInclude;
+
 		private SessionRepositoryRequestWrapper(HttpServletRequest request, HttpServletResponse response) {
 			super(request);
 			this.response = response;
@@ -343,7 +345,7 @@ public String getRequestedSessionId() {
 		@Override
 		public RequestDispatcher getRequestDispatcher(String path) {
 			RequestDispatcher requestDispatcher = super.getRequestDispatcher(path);
-			return new SessionCommittingRequestDispatcher(requestDispatcher);
+			return new SessionCommittingRequestDispatcher(requestDispatcher, this);
 		}
 
 		private S getRequestedSession() {
@@ -403,8 +405,11 @@ private final class SessionCommittingRequestDispatcher implements RequestDispatc
 
 			private final RequestDispatcher delegate;
 
-			SessionCommittingRequestDispatcher(RequestDispatcher delegate) {
+			private final SessionRepositoryRequestWrapper wrapper;
+
+			SessionCommittingRequestDispatcher(RequestDispatcher delegate, SessionRepositoryRequestWrapper wrapper) {
 				this.delegate = delegate;
+				this.wrapper = wrapper;
 			}
 
 			@Override
@@ -414,7 +419,10 @@ public void forward(ServletRequest request, ServletResponse response) throws Ser
 
 			@Override
 			public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-				SessionRepositoryRequestWrapper.this.commitSession();
+				if (!this.wrapper.hasCommitedInInclude) {
+					SessionRepositoryRequestWrapper.this.commitSession();
+					this.wrapper.hasCommitedInInclude = true;
+				}
 				this.delegate.include(request, response);
 			}