330c330
< 
---
>                                                
624,628d623
<         synchronized (this) {
<             if (intoThreadLocal == null) {
<                 intoThreadLocal = new IntoThreadLocal();
<             }
<         }
630c625,629
<         return getComponent(componentKeyOrType, (Class<? extends Annotation>) null);
---
>         try {
>             return getComponent(componentKeyOrType, (Class<? extends Annotation>) null);
>         } finally {
>             intoThreadLocal.set(null);
>         }
687,691d685
<                     synchronized (this) {
<                         if (intoThreadLocal == null) {
<                             intoThreadLocal = new IntoThreadLocal();
<                         }
<                     }