litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
j2blake 2014-01-15 15:29:27 -05:00
commit 69ad4907e7
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
webapp/src/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java
View file

@ -69,6 +69,9 @@ public class StartupManager implements ServletContextListener {
} catch (Exception e) {
ss.fatal(this, "Startup threw an unexpected exception.", e);
log.error("Startup threw an unexpected exception.", e);
} catch (Throwable t) {
log.fatal("Startup threw an unexpected error.", t);
throw t;
}
}
@ -177,6 +180,9 @@ public class StartupManager implements ServletContextListener {
ss.listenerExecuted(listener);
} catch (Exception e) {
ss.fatal(listener, "Threw unexpected exception", e);
} catch (Throwable t) {
log.fatal(listener + " Threw unexpected error", t);
throw t;
}
}
@ -214,6 +220,10 @@ public class StartupManager implements ServletContextListener {
} catch (Exception e) {
log.error("Unexpected exception from contextDestroyed() on '"
+ listener.getClass().getName() + "'", e);
} catch (Throwable t) {
log.fatal("Unexpected error from contextDestroyed() on '"
+ listener.getClass().getName() + "'", t);
throw t;
}
}
log.info("Called 'contextDestroyed' on all listeners.");