commit c46f732560105c1969ae21eaf645ffa62e356d33
author Sebastian Schlatow <sebastian.schlatow@cewe.de> Tue Sep 07 18:17:11 2021 +0200
committer Mark Struberg <struberg@yahoo.de> Sun Sep 12 10:09:54 2021 +0200
tree b6d48b8f376bb21eae1f07cc6f595b7736bc88ff
parent 150a311198a11999566eaa1b6f4fb5623ea2fd4e

OWB-1389 Remove destroyed instance directly

webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatInstanceManager.java

diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatInstanceManager.java b/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatInstanceManager.java
index f9a8d46..9889341 100644
--- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatInstanceManager.java
+++ b/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatInstanceManager.java
@@ -47,7 +47,7 @@
     @Override
     public void destroyInstance(Object instance) throws IllegalAccessException, InvocationTargetException
     {
-        Object injectorInstance = this.objects.get(instance);
+        Object injectorInstance = this.objects.remove(instance);
         if (injectorInstance != null)
         {
             try
@@ -64,7 +64,6 @@
             }
         }
         this.processor.destroyInstance(instance);
-        this.objects.remove(instance);
         if (log.isDebugEnabled())
         {
             log.debug("Number of 'objects' map entries after destroying instance: " + this.objects.size());