fix servlet startup sequence, fixes #2681

This commit is contained in:
Xavier Léauté 2016-03-18 15:05:57 -07:00
parent 52522eb0e0
commit 25967d0ed8
1 changed files with 13 additions and 1 deletions

View File

@ -120,6 +120,8 @@ public class AsyncQueryForwardingServlet extends AsyncProxyServlet
@Override @Override
public void init() throws ServletException public void init() throws ServletException
{ {
super.init();
// separate client with more aggressive connection timeouts // separate client with more aggressive connection timeouts
// to prevent cancellations requests from blocking queries // to prevent cancellations requests from blocking queries
broadcastClient = httpClientProvider.get(); broadcastClient = httpClientProvider.get();
@ -131,7 +133,17 @@ public class AsyncQueryForwardingServlet extends AsyncProxyServlet
} catch(Exception e) { } catch(Exception e) {
throw new ServletException(e); throw new ServletException(e);
} }
super.init(); }
@Override
public void destroy()
{
super.destroy();
try {
broadcastClient.stop();
} catch(Exception e) {
log.warn(e, "Error stopping servlet");
}
} }
@Override @Override