From 4ff1429245b3748372643251a92d71821f257ccf Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 09:36:09 -0400
Subject: [PATCH] Merged #33 "Merge overrides in addition to merging the normal settings"
---
src/main/java/com/gitblit/dagger/DaggerContext.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/dagger/DaggerContext.java b/src/main/java/com/gitblit/dagger/DaggerContext.java
index 28ee25d..0e6a3fc 100644
--- a/src/main/java/com/gitblit/dagger/DaggerContext.java
+++ b/src/main/java/com/gitblit/dagger/DaggerContext.java
@@ -61,7 +61,7 @@
@Override
public final void contextDestroyed(ServletContextEvent contextEvent) {
ServletContext context = contextEvent.getServletContext();
- context.setAttribute(INJECTOR_NAME, null);
+ context.removeAttribute(INJECTOR_NAME);
destroyContext(context);
}
}
--
Gitblit v1.9.1