From fc11c866b19cd092261c65383fe33596628eb061 Mon Sep 17 00:00:00 2001 From: Dustin Jenkins <Dustin.Jenkins@nrc-cnrc.gc.ca> Date: Tue, 28 Jul 2015 11:43:42 -0700 Subject: [PATCH] Story 1662: Use new /ac login features. --- .../src/ca/nrc/cadc/ac/server/web/users/UsersServlet.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UsersServlet.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UsersServlet.java index 926ce997..c3f2e53c 100644 --- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UsersServlet.java +++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UsersServlet.java @@ -173,13 +173,14 @@ public class UsersServlet extends HttpServlet { final String requestedContentType = request.getHeader("Accept"); - if (!UsersAction.JSON_CONTENT_TYPE.equals(requestedContentType)) + if (StringUtil.hasText(requestedContentType) + && requestedContentType.contains(UsersAction.JSON_CONTENT_TYPE)) { - return UsersAction.DEFAULT_CONTENT_TYPE; + return UsersAction.JSON_CONTENT_TYPE; } else { - return requestedContentType; + return UsersAction.DEFAULT_CONTENT_TYPE; } } } -- GitLab