WELD-1802 RequestScopedCache - Make sure each request is ended before…

… a new one is started
weld · Dec 4, 2014 · 6808b11 · 6808b11
1 parent 29fd110
commit 6808b11
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/impl/src/main/java/org/jboss/weld/context/cache/RequestScopedCache.java b/impl/src/main/java/org/jboss/weld/context/cache/RequestScopedCache.java
@@ -71,6 +71,8 @@ public void invalidate() {
     }
 
     public static void beginRequest() {
+        // if the previous request was not ended properly for some reason, make sure it is ended now
+        endRequest();
         CACHE.set(new LinkedList<RequestScopedItem>());
     }
 
@@ -80,8 +82,8 @@ public static void beginRequest() {
      */
     public static void endRequest() {
         final List<RequestScopedItem> result = CACHE.get();
-        CACHE.remove();
         if (result != null) {
+            CACHE.remove();
             for (final RequestScopedItem item : result) {
                 item.invalidate();
             }