From d1c0ea7d74db8691ea7b72ecce7a84544a2026be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vedran=20Pavi=C4=87?= Date: Mon, 16 Jan 2017 03:17:54 +0100 Subject: [PATCH] Set MockSessionCookieConfig#maxAge default to -1 Issue: SPR-15142 (cherry picked from 83beb9d57d558d1386c194b7792c88134105dfa4) --- .../org/springframework/mock/web/MockSessionCookieConfig.java | 4 ++-- .../mock/web/test/MockSessionCookieConfig.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockSessionCookieConfig.java b/spring-test/src/main/java/org/springframework/mock/web/MockSessionCookieConfig.java index c968e51bfbd..8335c2db8d7 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockSessionCookieConfig.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockSessionCookieConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ public class MockSessionCookieConfig implements SessionCookieConfig { private boolean secure; - private int maxAge; + private int maxAge = -1; @Override diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockSessionCookieConfig.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockSessionCookieConfig.java index 5300d8374e9..5933d2c781c 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockSessionCookieConfig.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockSessionCookieConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ public class MockSessionCookieConfig implements SessionCookieConfig { private boolean secure; - private int maxAge; + private int maxAge = -1; @Override