Skip to content
Snippets Groups Projects
Commit 6f184419 authored by Alinga Yeung's avatar Alinga Yeung
Browse files

Story ac2. Updated after Brian's code review comments.

parent f7b8e184
No related branches found
No related tags found
No related merge requests found
...@@ -97,7 +97,6 @@ public class PasswordServlet extends HttpServlet ...@@ -97,7 +97,6 @@ public class PasswordServlet extends HttpServlet
public void doPost(final HttpServletRequest request, final HttpServletResponse response) public void doPost(final HttpServletRequest request, final HttpServletResponse response)
throws IOException throws IOException
{ {
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
final ServletLogInfo logInfo = new ServletLogInfo(request); final ServletLogInfo logInfo = new ServletLogInfo(request);
log.info(logInfo.start()); log.info(logInfo.start());
...@@ -106,7 +105,7 @@ public class PasswordServlet extends HttpServlet ...@@ -106,7 +105,7 @@ public class PasswordServlet extends HttpServlet
final Subject subject = AuthenticationUtil.getSubject(request); final Subject subject = AuthenticationUtil.getSubject(request);
if ((subject == null) || (subject.getPrincipals(HttpPrincipal.class).isEmpty())) if ((subject == null) || (subject.getPrincipals(HttpPrincipal.class).isEmpty()))
{ {
logInfo.setMessage("Missing subject"); logInfo.setMessage("Unauthorized subject");
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
} }
else else
...@@ -119,7 +118,6 @@ public class PasswordServlet extends HttpServlet ...@@ -119,7 +118,6 @@ public class PasswordServlet extends HttpServlet
{ {
try try
{ {
response.setStatus(HttpServletResponse.SC_OK);
final Set<HttpPrincipal> webPrincipals = final Set<HttpPrincipal> webPrincipals =
subject.getPrincipals(HttpPrincipal.class); subject.getPrincipals(HttpPrincipal.class);
...@@ -174,6 +172,7 @@ public class PasswordServlet extends HttpServlet ...@@ -174,6 +172,7 @@ public class PasswordServlet extends HttpServlet
log.error(message, t); log.error(message, t);
logInfo.setSuccess(false); logInfo.setSuccess(false);
logInfo.setMessage(message); logInfo.setMessage(message);
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} }
finally finally
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment