Commit f5e30ec2 authored by Alinga Yeung's avatar Alinga Yeung
Browse files

Merge branch 's1869' of /srv/cadc/git/ac into s1869

parents 96dc25dd b252fe25

cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ResetPasswordServlet.java

+2 −1
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
package ca.nrc.cadc.ac.server.web;



import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.UserNotFoundException;

import ca.nrc.cadc.ac.server.ACScopeValidator;

import ca.nrc.cadc.ac.server.PluginFactory;

import ca.nrc.cadc.ac.server.UserPersistence;
@@ -185,7 +186,7 @@ public class ResetPasswordServlet extends HttpServlet 
                String msg = e.getMessage();

                log.debug(msg, e);

                logInfo.setMessage(msg);

                if (msg.contains("User not found "))

                if (e instanceof UserNotFoundException)

                {            

                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);

                }