GAUCAMOLE-195: Fix code style issues to conform to project standards.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/ab27739b Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/ab27739b Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/ab27739b Branch: refs/heads/master Commit: ab27739b02d6941b761af580969c449a7e3d2bdb Parents: ee9fb5d Author: Nick Couchman <nick.couch...@yahoo.com> Authored: Mon Jan 30 08:09:18 2017 -0500 Committer: Nick Couchman <nick.couch...@yahoo.com> Committed: Tue Jan 31 22:22:59 2017 -0500 ---------------------------------------------------------------------- .../guacamole/auth/http/AuthenticationProviderService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ab27739b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java index 1d86deb..1ef02fe 100644 --- a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java +++ b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java @@ -74,10 +74,11 @@ public class AuthenticationProviderService { HttpServletRequest request = credentials.getRequest(); if (request != null) { String username = request.getRemoteUser(); - if(username == null) { + if(username == null) username = request.getHeader(confService.getHttpAuthHeader()); - } + if (username != null) { + logger.debug("Authenticating with user {}", username); AuthenticatedUser authenticatedUser = authenticatedUserProvider.get(); authenticatedUser.init(username, credentials); return authenticatedUser;
