svn commit: r1844046 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: annotation/AnnotationManager.java config/BeansDeployer.java container/BeanManagerImpl.java

[tandraschko]

Author: tandraschko
Date: Tue Oct 16 20:18:13 2018
New Revision: 1844046

URL: http://svn.apache.org/viewvc?rev=1844046&view=rev
Log:
refactored method name

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java?rev=1844046&r1=1844045&r2=1844046&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
 Tue Oct 16 20:18:13 2018
@@ -934,7 +934,7 @@ public final class AnnotationManager
         }
     }
     
-    public void clearStartupCache()
+    public void clearCaches()
     {
         repeatableMethodCheckedTypes.clear();
         repeatableMethodCache.clear();

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1844046&r1=1844045&r2=1844046&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
 Tue Oct 16 20:18:13 2018
@@ -329,9 +329,6 @@ public class BeansDeployer
 
                 validateNames();
 
-                webBeansContext.getNotificationManager().clearCaches();
-                webBeansContext.getAnnotationManager().clearStartupCache();
-
                 if 
(webBeansContext.getNotificationManager().getObserverMethods().stream()
                         .anyMatch(ObserverMethod::isAsync))
                 {
@@ -349,6 +346,8 @@ public class BeansDeployer
                 // do some cleanup after the deployment
                 scanner.release();
                 webBeansContext.getAnnotatedElementFactory().clear();
+                webBeansContext.getNotificationManager().clearCaches();
+                webBeansContext.getAnnotationManager().clearCaches();
             }
         }
         catch (UnsatisfiedResolutionException e)

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1844046&r1=1844045&r2=1844046&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
 Tue Oct 16 20:18:13 2018
@@ -1468,6 +1468,7 @@ public class BeanManagerImpl implements
         webBeansContext.getAnnotatedElementFactory().clear();
 
         injectionResolver.clearCaches();
+        webBeansContext.getAnnotationManager().clearCaches();
 
         // finally destroy all SPI services
         webBeansContext.clear();