openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r906475 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
Date Thu, 04 Feb 2010 12:51:27 GMT
Author: struberg
Date: Thu Feb  4 12:51:25 2010
New Revision: 906475

URL: http://svn.apache.org/viewvc?rev=906475&view=rev
Log:
OWB-263 BeanManagerImpl#isPassivatingScope need to additionally consider Scopes added via
BeforeBeanDiscovery#addScope()

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

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=906475&r1=906474&r2=906475&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
Thu Feb  4 12:51:25 2010
@@ -69,6 +69,7 @@
 import org.apache.webbeans.intercept.InterceptorComparator;
 import org.apache.webbeans.intercept.WebBeansInterceptorConfig;
 import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor;
+import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.plugins.OpenWebBeansEjbPlugin;
 import org.apache.webbeans.plugins.OpenWebBeansJmsPlugin;
 import org.apache.webbeans.plugins.PluginLoader;
@@ -312,6 +313,7 @@
         {
             PassivationCapable pc = (PassivationCapable) bean;
             String id = pc.getId();
+
             if (id != null)
             {
                 Bean<?> oldBean = passivationCapableBeans.put(id, bean);
@@ -856,6 +858,16 @@
     @Override
     public boolean isPassivatingScope(Class<? extends Annotation> annotationType)
     {
+        if(additionalScopes.contains(annotationType))
+        {
+            for (ExternalScope extScope : additionalScopes)
+            {
+                if (extScope.equals(annotationType)) {
+                    return extScope.isPassivating();
+                }
+            }
+        }
+
         if(AnnotationUtil.hasAnnotation(annotationType.getDeclaredAnnotations(), NormalScope.class))
         {
             NormalScope scope = annotationType.getAnnotation(NormalScope.class);        
   



Mime
View raw message