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

Kai Reinhard
20.47.2018 b81e7dfa1b41dc6e1ed3f365af1571399ddd38bd
Works now.
1 files modified
12 ■■■■■ changed files
borgbutler-core/src/main/java/de/micromata/borgbutler/DiffTool.java 12 ●●●●● patch | view | raw | blame | history
borgbutler-core/src/main/java/de/micromata/borgbutler/DiffTool.java
@@ -55,17 +55,13 @@
                other = otherIt.hasNext() ? otherIt.next() : null;
            }
        }
        while (currentIt.hasNext()) {
            if (current == null)
                current = currentIt.next();
        while (current != null) {
            result.add(current.setDiffStatus(BorgFilesystemItem.DiffStatus.NEW));
            current = null;
            current = currentIt.hasNext() ? currentIt.next() : null;
        }
        while (otherIt.hasNext()) {
            if (other == null)
                other = otherIt.next();
        while (other != null) {
            result.add(other.setDiffStatus(BorgFilesystemItem.DiffStatus.REMOVED));
            other = null;
            other = otherIt.hasNext() ? otherIt.next() : null;
        }
        return result;
    }