From afdb1082a7b5bf29be6c2dd21b593ef69562764a Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 16 Dec 2018 14:54:32 +0000
Subject: [PATCH] Archive content from array to list.
---
borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java
index 15938c1..483f9a8 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java
@@ -15,10 +15,7 @@
import java.nio.file.Files;
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.attribute.FileTime;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
+import java.util.*;
/**
* Cache for storing complete file lists of archives as gzipped files (using Java standard serialization for
@@ -61,7 +58,7 @@
* @param archive
* @return
*/
- public BorgFilesystemItem[] load(BorgRepoConfig repoConfig, Archive archive) {
+ public List<BorgFilesystemItem> load(BorgRepoConfig repoConfig, Archive archive) {
File file = getFile(repoConfig, archive);
if (!file.exists()) {
return null;
@@ -69,13 +66,13 @@
return load(file);
}
- public BorgFilesystemItem[] load(File file) {
+ public List<BorgFilesystemItem> load(File file) {
if (file.exists() == false) {
log.error("File '" + file.getAbsolutePath() + "' doesn't exist. Can't get archive content files.");
return null;
}
log.info("Loading archive content as file list from: " + file.getAbsolutePath());
- BorgFilesystemItem[] list = null;
+ List<BorgFilesystemItem> list = null;
try {
// Set last modified time of file:
Files.setAttribute(file.toPath(), "lastModifiedTime", FileTime.fromMillis(System.currentTimeMillis()));
@@ -89,11 +86,11 @@
return null;
}
int size = (Integer) obj;
- list = new BorgFilesystemItem[size];
+ list = new ArrayList<>();
for (int i = 0; i < size; i++) {
obj = inputStream.readObject();
if (obj instanceof BorgFilesystemItem) {
- list[i] = (BorgFilesystemItem) obj;
+ list.add((BorgFilesystemItem) obj);
} else {
log.error("Can't load archive content. FilesystemItem expected, but received: "
+ (obj != null ? obj.getClass() : "null")
--
Gitblit v1.10.0