From 0cfd98a12782e1d792a7293de429dce24d65ef71 Mon Sep 17 00:00:00 2001 From: Rsl1122 <24460436+Rsl1122@users.noreply.github.com> Date: Fri, 17 Jan 2020 20:34:09 +0200 Subject: [PATCH] Fixed memory leak when using Export Also fixes an issue where players with partially same name get wrong json URL --- .../com/djrapitops/plan/delivery/export/ExportPaths.java | 5 +++++ .../djrapitops/plan/delivery/export/NetworkPageExporter.java | 1 + .../djrapitops/plan/delivery/export/PlayerPageExporter.java | 1 + .../djrapitops/plan/delivery/export/PlayersPageExporter.java | 1 + .../djrapitops/plan/delivery/export/ServerPageExporter.java | 1 + 5 files changed, 9 insertions(+) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ExportPaths.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ExportPaths.java index c3aef2ad0..79f8c9dda 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ExportPaths.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ExportPaths.java @@ -44,4 +44,9 @@ public class ExportPaths { this.replace.add(replace); this.with.add(with); } + + public void clear() { + this.replace.clear(); + this.with.clear(); + } } \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java index 20af30170..1fc9c630b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java @@ -84,6 +84,7 @@ public class NetworkPageExporter extends FileExporter { exportRequiredResources(toDirectory); exportJSON(toDirectory, server); exportHtml(toDirectory); + exportPaths.clear(); } private void exportHtml(Path toDirectory) throws IOException, GenerationException { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayerPageExporter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayerPageExporter.java index 6f0feb036..9429a12d0 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayerPageExporter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayerPageExporter.java @@ -89,6 +89,7 @@ public class PlayerPageExporter extends FileExporter { Path playerDirectory = toDirectory.resolve("player/" + toFileName(playerName)); exportJSON(playerDirectory, playerUUID, playerName); exportHtml(playerDirectory, playerUUID); + exportPaths.clear(); } private void exportHtml(Path playerDirectory, UUID playerUUID) throws IOException, GenerationException, NotFoundException { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayersPageExporter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayersPageExporter.java index a96b7a809..d6811a577 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayersPageExporter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayersPageExporter.java @@ -87,6 +87,7 @@ public class PlayersPageExporter extends FileExporter { exportRequiredResources(toDirectory); exportJSON(toDirectory); exportHtml(toDirectory); + exportPaths.clear(); } private void exportHtml(Path toDirectory) throws IOException, GenerationException { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java index 77d6e3195..ec3e74771 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java @@ -89,6 +89,7 @@ public class ServerPageExporter extends FileExporter { exportRequiredResources(toDirectory); exportJSON(toDirectory, server); exportHtml(toDirectory, server); + exportPaths.clear(); } private void exportHtml(Path toDirectory, Server server) throws IOException, NotFoundException, GenerationException {