/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
 *
 * Use is subject to license terms.
 *
 * JBoss, Home of Professional Open Source
 * Copyright 2008, Red Hat, Inc., and individual contributors
 * by the @authors tag. See the copyright.txt in the distribution for a
 * full listing of individual contributors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * http://www.apache.org/licenses/LICENSE-2.0
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.jboss.weld.context;

import org.jboss.weld.bootstrap.api.Singleton;
import org.jboss.weld.bootstrap.api.SingletonProvider;
import org.jboss.weld.context.beanstore.BeanStore;
import org.jboss.weld.context.beanstore.ConcurrentHashMapBeanStore;

public abstract class AbstractSharedContext extends AbstractContext {

    // The beans
    private final Singleton<BeanStore> beanStore;

    /**
     * Constructor
     */
    protected AbstractSharedContext() {
        super(true);
        this.beanStore = SingletonProvider.instance().create(BeanStore.class);
        beanStore.set(new ConcurrentHashMapBeanStore());
    }

    /**
     * Gets the bean store
     *
     * @return The bean store
     */
    @Override
    public BeanStore getBeanStore() {
        return this.beanStore.get();
    }

    public boolean isActive() {
        return true;
    }

    public void invalidate() {
        destroy();
    }

    @Override
    protected void destroy() {
        super.destroy();
        cleanup();
    }

    @Override
    public void cleanup() {
        super.cleanup();
        beanStore.clear();
    }

    @Override
    public String toString() {
        String active = isActive() ? "Active " : "Inactive ";
        String beanStoreInfo = getBeanStore() == null ? "" : getBeanStore().toString();
        return active + "application context " + beanStoreInfo;
    }

}

@@ -973,110 +973,8 @@
 t;%0A%0A
-import org.jboss.weld.bootstrap.api.Singleton;%0Aimport org.jboss.weld.bootstrap.api.SingletonProvider;%0A
 impo
@@ -1020,16 +1020,16 @@
 nStore;%0A
+
 import o
@@ -1199,18 +1199,8 @@
 nal 
-Singleton%3C
 Bean
@@ -1208,9 +1208,8 @@
 tore
-%3E
  bea
@@ -1342,84 +1342,8 @@
 e = 
-SingletonProvider.instance().create(BeanStore.class);%0A        beanStore.set(
 new 
@@ -1370,17 +1370,16 @@
 nStore()
-)
 ;%0A    %7D%0A
@@ -1507,24 +1507,24 @@
 anStore() %7B%0A
+
         retu
@@ -1544,14 +1544,8 @@
 tore
-.get()
 ;%0A  

Remove unessesary use of Singleton in AbstractSharedContext