mirror of https://github.com/micromata/borgbackup-butler.git

Kai Reinhard
09.07.2018 47a38710b11fbb80a5c3d61b3879636d1a858ca5
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
@@ -3,6 +3,7 @@
import de.micromata.borgbutler.config.BorgRepoConfig;
import de.micromata.borgbutler.config.Configuration;
import de.micromata.borgbutler.config.ConfigurationHandler;
import de.micromata.borgbutler.config.Definitions;
import de.micromata.borgbutler.json.JsonUtils;
import de.micromata.borgbutler.json.borg.ArchiveInfo;
import de.micromata.borgbutler.json.borg.RepoInfo;
@@ -15,7 +16,6 @@
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.Map;
public class BorgCommands {
@@ -96,11 +96,11 @@
            executor.execute(cmdLine, getEnvironment(repoConfig));
        } catch (Exception ex) {
            log.error("Error while creating environment for borg call '" + borgCall + "': " + ex.getMessage(), ex);
            String response = outputStream.toString(Charset.forName("UTF-8"));
            String response = outputStream.toString(Definitions.STD_CHARSET);
            log.error("Response: " + response);
            return null;
        }
        String json = outputStream.toString(Charset.forName("UTF-8"));
        String json = outputStream.toString(Definitions.STD_CHARSET);
        return json;
    }