/*
 * 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.client.impl.protocol.task.cache;

import com.hazelcast.cache.impl.CacheKeyIteratorResult;
import com.hazelcast.cache.impl.CacheOperationProvider;
import com.hazelcast.cache.impl.operation.CacheKeyIteratorOperation;
import com.hazelcast.client.impl.protocol.ClientMessage;
import com.hazelcast.client.impl.protocol.codec.CacheIterateCodec;
import com.hazelcast.instance.Node;
import com.hazelcast.nio.Connection;
import com.hazelcast.spi.Operation;

/**
 * This client request  specifically calls {@link CacheKeyIteratorOperation} on the server side.
 *
 * @see CacheKeyIteratorOperation
 */
public class CacheIterateMessageTask
        extends AbstractCacheMessageTask<CacheIterateCodec.RequestParameters> {

    public CacheIterateMessageTask(ClientMessage clientMessage, Node node, Connection connection) {
        super(clientMessage, node, connection);
    }

    @Override
    protected Operation prepareOperation() {
        CacheOperationProvider operationProvider = getOperationProvider(parameters.name);
        return operationProvider.createKeyIteratorOperation(parameters.tableIndex, parameters.batch);
    }

    @Override
    protected CacheIterateCodec.RequestParameters decodeClientMessage(ClientMessage clientMessage) {
        return CacheIterateCodec.decodeRequest(clientMessage);
    }

    @Override
    protected ClientMessage encodeResponse(Object response) {
        CacheKeyIteratorResult cacheKeyIteratorResult = (CacheKeyIteratorResult) response;
        return CacheIterateCodec.encodeResponse(cacheKeyIteratorResult.getTableIndex(), cacheKeyIteratorResult.getKeys());
    }

    @Override
    public String getDistributedObjectName() {
        return parameters.name;
    }
}

@@ -1079,21 +1079,97 @@
 ast.
-spi.Operation
+nio.serialization.Data;%0Aimport com.hazelcast.spi.Operation;%0A%0Aimport java.util.Collections
 ;%0A%0A/
@@ -2113,37 +2113,161 @@
     
+if (response == null) %7B%0A            return 
 Cache
-Key
 Iterat
-orResult cacheK
+eCodec.encodeResponse(0, Collections.%3CData%3EemptyList());%0A        %7D%0A        CacheKeyIteratorResult k
 eyIt
@@ -2364,22 +2364,17 @@
 esponse(
-cacheK
+k
 eyIterat
@@ -2403,14 +2403,9 @@
 (), 
-cacheK
+k
 eyIt

Return empty list when operation result is null.