root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-01-16 10:08:55 +01:00
parent d477223d77 ddf1408679
commit d271b54f63
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServices.java
View File

@ -123,7 +123,7 @@ public class UserInfoTokenServices implements ResourceServerTokenServices {
@SuppressWarnings({ "unchecked" }) @SuppressWarnings({ "unchecked" })
private Map<String, Object> getMap(String path, String accessToken) { private Map<String, Object> getMap(String path, String accessToken) {
this.logger.info("Getting user info from: " + path); this.logger.debug("Getting user info from: " + path);
try { try {
OAuth2RestOperations restTemplate = this.restTemplate; OAuth2RestOperations restTemplate = this.restTemplate;
if (restTemplate == null) { if (restTemplate == null) {
@ -142,7 +142,7 @@ public class UserInfoTokenServices implements ResourceServerTokenServices {
return restTemplate.getForEntity(path, Map.class).getBody(); return restTemplate.getForEntity(path, Map.class).getBody();
} }
catch (Exception ex) { catch (Exception ex) {
this.logger.info("Could not fetch user details: " + ex.getClass() + ", " this.logger.warn("Could not fetch user details: " + ex.getClass() + ", "
+ ex.getMessage()); + ex.getMessage());
return Collections.<String, Object>singletonMap("error", return Collections.<String, Object>singletonMap("error",
"Could not fetch user details"); "Could not fetch user details");