Commit 17870446 authored by Brian Major's avatar Brian Major
Browse files

s1890 - removed shutdown() call from UserRequestServlet

parent f257c482

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

+18 −25
Original line number Diff line number Diff line
@@ -68,37 +68,36 @@ 
 */

package ca.nrc.cadc.ac.server.web;



import java.io.IOException;

import java.security.AccessController;

import java.security.Principal;

import java.security.PrivilegedActionException;

import java.util.ArrayList;

import java.util.List;

import java.util.Set;



import javax.security.auth.Subject;

import javax.security.auth.x500.X500Principal;

import javax.servlet.ServletConfig;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import org.apache.log4j.Logger;



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

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

import ca.nrc.cadc.ac.server.web.SyncOutput;

import ca.nrc.cadc.ac.server.web.userrequests.AbstractUserRequestAction;

import ca.nrc.cadc.ac.server.web.userrequests.CreateUserRequestAction;

import ca.nrc.cadc.ac.server.web.userrequests.UserRequestActionFactory;

import ca.nrc.cadc.ac.server.web.users.AbstractUserAction;

import ca.nrc.cadc.ac.server.web.users.GetUserAction;

import ca.nrc.cadc.ac.server.web.users.UserActionFactory;

import ca.nrc.cadc.ac.server.web.users.UserLogInfo;

import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.ServletPrincipalExtractor;

import ca.nrc.cadc.profiler.Profiler;

import ca.nrc.cadc.util.StringUtil;

import org.apache.log4j.Logger;



import javax.security.auth.Subject;

import javax.security.auth.x500.X500Principal;

import javax.servlet.ServletConfig;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;

import java.io.IOException;

import java.security.AccessController;

import java.security.Principal;

import java.security.PrivilegedActionException;

import java.util.ArrayList;

import java.util.List;

import java.util.Set;



public class UserRequestServlet extends HttpServlet

{
@@ -158,12 +157,6 @@ public class UserRequestServlet extends HttpServlet 
        }

    }



    @Override

    public void destroy()

    {

        userPersistence.destroy();

    }



    /**

     * Create a UserAction and run the action safely.

     */