New upstream version 0.0.0+svn4807
Bas Couwenberg
2 years ago
| 0 | |
svn.version: 4806
|
| 1 | |
build.timestamp: 2021-08-10T09:45:55+0100
|
|
0 |
svn.version: 4807
|
|
1 |
build.timestamp: 2021-09-14T09:45:24+0100
|
| 18 | 18 |
import java.io.InputStream;
|
| 19 | 19 |
import java.io.InputStreamReader;
|
| 20 | 20 |
import java.io.PrintStream;
|
| 21 | |
import java.nio.charset.StandardCharsets;
|
| 22 | 21 |
import java.lang.management.ManagementFactory;
|
| 23 | 22 |
import java.lang.management.MemoryPoolMXBean;
|
| 24 | 23 |
import java.lang.management.MemoryType;
|
| 25 | 24 |
import java.lang.management.MemoryUsage;
|
|
25 |
import java.nio.charset.StandardCharsets;
|
| 26 | 26 |
import java.nio.file.Files;
|
| 27 | 27 |
import java.time.Duration;
|
| 28 | 28 |
import java.time.Instant;
|
|
| 612 | 612 |
for (Combiner c : combiners)
|
| 613 | 613 |
c.init(args);
|
| 614 | 614 |
|
| 615 | |
filenames.removeIf(f -> f == null || f.isCancelled());
|
|
615 |
filenames.removeIf(f -> f == null || f.getFilename() == null || f.isCancelled());
|
| 616 | 616 |
|
| 617 | 617 |
final Map<String, Integer> nameToHex = new HashMap<>();
|
| 618 | 618 |
for (FilenameTask f : filenames) {
|