From c5395cff858b1c5acc9380618d478401d6369332 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@intalio.com>
Date: Mon, 17 Sep 2012 17:13:20 +1000
Subject: [PATCH] 389452 if web-fragment metadata-complete==true still scan its
 related jar if there there is a ServletContainerInitializer, ensure webapp
 restarts work

---
 .../eclipse/jetty/annotations/AnnotationConfiguration.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
index 489c08b24b1..e927dd02942 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
@@ -129,16 +129,19 @@ public class AnnotationConfiguration extends AbstractConfiguration
         MultiMap map = (MultiMap)context.getAttribute(CLASS_INHERITANCE_MAP);
         if (map != null)
             map.clear();
+        
+        context.removeAttribute(CLASS_INHERITANCE_MAP);
+        
         List<ContainerInitializer> initializers = (List<ContainerInitializer>)context.getAttribute(CONTAINER_INITIALIZERS);
         if (initializers != null)
             initializers.clear();
         if (_discoverableAnnotationHandlers != null)
             _discoverableAnnotationHandlers.clear();
-        _discoverableAnnotationHandlers = null;
+      
         _classInheritanceHandler = null;
         if (_containerInitializerAnnotationHandlers != null)
             _containerInitializerAnnotationHandlers.clear();
-        _containerInitializerAnnotationHandlers = null;
+  
         super.postConfigure(context);
     }