/*
 * Copyright (c) 2008-2015, Hazelcast, Inc. All Rights Reserved.
 *
 * 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 com.hazelcast.cache.impl.operation;

import com.hazelcast.cache.impl.CacheDataSerializerHook;
import com.hazelcast.cache.impl.ICacheService;
import com.hazelcast.config.CacheConfig;
import com.hazelcast.config.CacheSimpleConfig;
import com.hazelcast.nio.ObjectDataInput;
import com.hazelcast.nio.ObjectDataOutput;
import com.hazelcast.spi.ReadonlyOperation;

import javax.cache.CacheException;
import java.io.IOException;

/**
 * Cache GetConfig Operation.
 * <p>Gets the already created cache configuration from the related partition.</p>
 * @see CacheCreateConfigOperation
 */
public class CacheGetConfigOperation
        extends PartitionWideCacheOperation
        implements ReadonlyOperation {

    private String simpleName;

    public CacheGetConfigOperation() {
    }

    public CacheGetConfigOperation(String name, String simpleName) {
        super(name);
        this.simpleName = simpleName;
    }

    @Override
    public void run()
            throws Exception {
        final ICacheService service = getService();
        final CacheConfig cacheConfig = service.getCacheConfig(name);
        if (cacheConfig == null) {
            CacheSimpleConfig simpleConfig = service.findCacheConfig(simpleName);
            if (simpleConfig != null) {
                try {
                    CacheConfig cacheConfigFromSimpleConfig = new CacheConfig(simpleConfig);
                    cacheConfigFromSimpleConfig.setName(simpleName);
                    cacheConfigFromSimpleConfig.setManagerPrefix(name.substring(0, name.lastIndexOf(simpleName)));
                    if (service.putCacheConfigIfAbsent(cacheConfigFromSimpleConfig) == null) {
                        response = cacheConfigFromSimpleConfig;
                        return;
                    }
                } catch (Exception e) {
                    //Cannot create the actual config from the declarative one
                    throw new CacheException(e);
                }
            }
        }
        response = cacheConfig;
    }

    @Override
    protected void writeInternal(ObjectDataOutput out)
            throws IOException {
        super.writeInternal(out);
        out.writeUTF(simpleName);
    }

    @Override
    protected void readInternal(ObjectDataInput in)
            throws IOException {
        super.readInternal(in);
        simpleName = in.readUTF();
    }

    @Override
    public int getId() {
        return CacheDataSerializerHook.GET_CONFIG;
    }
}

@@ -1668,22 +1668,16 @@
         
-final 
 CacheCon
@@ -1716,32 +1716,32 @@
 heConfig(name);%0A
+
         if (cach
@@ -1927,40 +1927,12 @@
     
-CacheConfig cacheConfigFromSimpl
+cach
 eCon
@@ -1999,32 +1999,16 @@
 heConfig
-FromSimpleConfig
 .setName
@@ -2052,32 +2052,16 @@
 heConfig
-FromSimpleConfig
 .setMana
@@ -2140,20 +2140,50 @@
         
-if (
+CacheConfig existingCacheConfig = 
 service.
@@ -2220,131 +2220,123 @@
 nfig
-FromSimpleConfig) == null) %7B%0A                        response = cacheConfigFromSimpleConfig;%0A                        return
+);%0A                    if (existingCacheConfig != null) %7B%0A                        cacheConfig = existingCacheConfig
 ;%0A  

Return cache config as response even though found and created cache config could not put into cache configs inside cache service in case of parallel access