/*
 * ProActive Parallel Suite(TM):
 * The Open Source library for parallel and distributed
 * Workflows & Scheduling, Orchestration, Cloud Automation
 * and Big Data Analysis on Enterprise Grids & Clouds.
 *
 * Copyright (c) 2007 - 2017 ActiveEon
 * Contact: contact@activeeon.com
 *
 * This library is free software: you can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License
 * as published by the Free Software Foundation: version 3 of
 * the License.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 * If needed, contact us to obtain a release under GPL Version 2 or 3
 * or a different license than the AGPL.
 */
package org.ow2.proactive_grid_cloud_portal.scheduler.dto;

import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

import org.apache.log4j.Logger;
import org.dozer.DozerConverter;
import org.ow2.proactive.utils.ObjectByteConverter;


public class StringPropagatedVariablesCustomConverter extends DozerConverter<Map, Map> {

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

    public StringPropagatedVariablesCustomConverter() {
        super(Map.class, Map.class);
    }

    @Override
    public Map convertTo(Map source, Map destination) {
        return null;
    }

    @Override
    @SuppressWarnings("unchecked")
    public Map convertFrom(Map source, Map destination) {
        if (source == null) {
            return null;
        }
        Map<String, String> converted = new HashMap<>();
        for (Map.Entry<String, byte[]> entry : ((Map<String, byte[]>) source).entrySet()) {
            try {
                converted.put(entry.getKey(), ObjectByteConverter.byteArrayToObject(entry.getValue()).toString());
            } catch (Exception e) {
                logger.error("Error when converting variables to json", e);
                return null;
            }
        }
        return converted;
    }
}

@@ -2027,106 +2027,357 @@
     
-converted.put(entry.getKey(), ObjectByteConverter.byteArrayToObject(entry.getValue()).toString());
+Object valueAsObject = ObjectByteConverter.byteArrayToObject(entry.getValue());%0A                if (valueAsObject != null) %7B%0A                    converted.put(entry.getKey(), valueAsObject.toString());%0A                %7D else if (entry.getValue() != null) %7B%0A                    logger.debug(%22Could not convert %22 + entry.toString());%0A                %7D
 %0A   

Fix NullPointerException on rest-client functional test (#3049)