Skip to content

Commit 909d1fd

Browse files
committed
Fix NullpointerException when stopping GitBlit Server.
When GitBlit server did not start properly, is running but couldn't start the `PluginManager`, then stopping the server via the `--stop` argument on the command line resulted in a NullpointerException. Which left the server running. Now this is prevented and the server will actually shut down.
1 parent b902e69 commit 909d1fd

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/main/java/com/gitblit/servlet/GitblitContext.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,13 @@ protected void destroyContext(ServletContext context) {
293293
logger.info("Gitblit context destroyed by servlet container.");
294294

295295
IPluginManager pluginManager = getManager(IPluginManager.class);
296-
for (LifeCycleListener listener : pluginManager.getExtensions(LifeCycleListener.class)) {
297-
try {
298-
listener.onShutdown();
299-
} catch (Throwable t) {
300-
logger.error(null, t);
296+
if (pluginManager != null) {
297+
for (LifeCycleListener listener : pluginManager.getExtensions(LifeCycleListener.class)) {
298+
try {
299+
listener.onShutdown();
300+
} catch (Throwable t) {
301+
logger.error(null, t);
302+
}
301303
}
302304
}
303305

0 commit comments

Comments
 (0)