further caching of Container.instance()

Author: Ståle Pedersen

impl/src/main/java/org/jboss/weld/context/AbstractContext.java

@@ -31,6 +31,7 @@
 import javax.enterprise.context.spi.CreationalContext;
 
 import org.jboss.weld.Container;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
 import org.jboss.weld.context.api.ContextualInstance;
 import org.jboss.weld.context.beanstore.BeanStore;
 import org.jboss.weld.exceptions.IllegalArgumentException;
@@ -59,6 +60,8 @@ public abstract class AbstractContext implements Context
 
    private final boolean multithreaded;
 
+   private static final ServiceRegistry CACHED_SERVICE_REGISTRY  = Container.instance().services();
+   
    /**
     * Constructor
     * 
@@ -192,7 +195,7 @@ protected static <T> Contextual<T> getContextual(String id)
 
    protected static String getId(Contextual<?> contextual)
    {
-      return Container.instance().services().get(ContextualStore.class).putIfAbsent(contextual);
+      return CACHED_SERVICE_REGISTRY.get(ContextualStore.class).putIfAbsent(contextual);
    }
 
 }

impl/src/main/java/org/jboss/weld/servlet/WeldListener.java

@@ -39,6 +39,7 @@
 import org.jboss.weld.context.http.HttpRequestContext;
 import org.jboss.weld.context.http.HttpSessionContext;
 import org.jboss.weld.exceptions.IllegalStateException;
+import org.jboss.weld.manager.BeanManagerImpl;
 import org.jboss.weld.servlet.api.helpers.AbstractServletListener;
 import org.slf4j.cal10n.LocLogger;
 
@@ -57,6 +58,8 @@ public class WeldListener extends AbstractServletListener
 
    private static final LocLogger log = loggerFactory().getLogger(SERVLET);
 
+   private static final BeanManagerImpl CACHED_BEAN_MANAGER = Container.instance().deploymentManager();
+
    @Override
    public void sessionDestroyed(HttpSessionEvent event)
    {
@@ -147,7 +150,7 @@ public void requestInitialized(ServletRequestEvent event)
 
    private static Instance<Context> instance()
    {
-      return Container.instance().deploymentManager().instance().select(Context.class);
+      return CACHED_BEAN_MANAGER.instance().select(Context.class);
    }
 
 }