/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You 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.apache.usergrid.persistence.queue.impl;

import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.apache.usergrid.persistence.queue.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutionException;

/**
 * manages whether we take in an external in memory override for queues.
 */
@Singleton
public class QueueManagerFactoryImpl implements LegacyQueueManagerFactory {

    private static final Logger logger = LoggerFactory.getLogger( QueueManagerFactoryImpl.class );

    private final LegacyQueueFig queueFig;
    private final LegacyQueueManagerInternalFactory queuemanagerInternalFactory;
    private final Map<String,LegacyQueueManager> defaultManager;
    private final LoadingCache<LegacyQueueScope, LegacyQueueManager> queueManager =
        CacheBuilder
            .newBuilder()
            .initialCapacity(5)
            .maximumSize(100)
            .build(new CacheLoader<LegacyQueueScope, LegacyQueueManager>() {

                @Override
                public LegacyQueueManager load(LegacyQueueScope scope ) throws Exception {

                    if ( queueFig.overrideQueueForDefault() ){

                        LegacyQueueManager manager = defaultManager.get( scope.getName() );
                        if ( manager == null ) {
                            logger.info("Using LocalQueueManager for scope {}", scope.getName() );
                            manager = new LocalQueueManager();
                            defaultManager.put( scope.getName(), manager );
                        }
                        return manager;

                    } else {
                        LegacyQueueManager queueManager = queuemanagerInternalFactory.getQueueManager( scope );
                        logger.info("Using queue manager {} for scope {}",
                            queueManager.getClass().getSimpleName(), scope.getName() );
                        return queueManager;
                    }

                }
            });

    @Inject
    public QueueManagerFactoryImpl(
        final LegacyQueueFig queueFig, final LegacyQueueManagerInternalFactory queuemanagerInternalFactory) {

        this.queueFig = queueFig;
        this.queuemanagerInternalFactory = queuemanagerInternalFactory;
        this.defaultManager = new HashMap<>(10);
    }

    @Override
    public LegacyQueueManager getQueueManager(LegacyQueueScope scope) {

        try {
            return queueManager.get(scope);

        } catch (ExecutionException e) {

            logger.error("Unable to load or retrieve queue manager from cache for queue {}", scope.getName());
            throw new RuntimeException(e);
        }

    }
}

@@ -2466,16 +2466,21 @@
 Manager(
+scope
 );%0A     

Fix issue with updated LocalQueueManager creation.