From e08e9cda007a82cb4ec414b9e89129d2c699168b Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Tue, 21 Apr 2015 14:57:32 -0500 Subject: [PATCH] SEC-2851: Remove DataAccessException import from Persistent RememberMe --- .../rememberme/PersistentTokenBasedRememberMeServices.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java index e97dcf63ca..42cead7417 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java @@ -7,7 +7,6 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.springframework.dao.DataAccessException; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.codec.Base64; @@ -127,7 +126,7 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe newToken.getDate()); addCookie(newToken, request, response); } - catch (DataAccessException e) { + catch (Exception e) { logger.error("Failed to update token: ", e); throw new RememberMeAuthenticationException( "Autologin failed due to data access problem"); @@ -153,7 +152,7 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe tokenRepository.createNewToken(persistentToken); addCookie(persistentToken, request, response); } - catch (DataAccessException e) { + catch (Exception e) { logger.error("Failed to save persistent token ", e); } }