From 9da01941d7296e07b8bad33646ea08486fb32e21 Mon Sep 17 00:00:00 2001 From: Fuzzlemann Date: Fri, 11 Aug 2017 17:15:46 +0200 Subject: [PATCH] Add null check add DumpLog.addLine(CharSequence) Cancels the DumpLog task (Forgot it) --- .../plan/command/commands/manage/ManageDumpCommand.java | 8 ++++++-- .../com/djrapitops/plan/utilities/file/dump/DumpLog.java | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDumpCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDumpCommand.java index 9d8ca7382..a51d4e801 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDumpCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDumpCommand.java @@ -50,8 +50,12 @@ public class ManageDumpCommand extends SubCommand { plugin.getRunnableFactory().createNew(new AbsRunnable("DumpTask") { @Override public void run() { - sender.sendLink("Link to the Dump", DumpUtils.dump(plugin)); - sender.sendLink("Report Issues here", "https://github.com/Rsl1122/Plan-PlayerAnalytics/issues/new"); + try { + sender.sendLink("Link to the Dump", DumpUtils.dump(plugin)); + sender.sendLink("Report Issues here", "https://github.com/Rsl1122/Plan-PlayerAnalytics/issues/new"); + } finally { + this.cancel(); + } } }).runTaskAsynchronously(); } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java index ec12ed12f..a996f1027 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java @@ -88,6 +88,11 @@ public class DumpLog { * @param line The content of the line */ private void addLine(CharSequence line) { + if (line == null) { + lines.add("\n"); + return; + } + lines.add(line.toString()); }