From a71f444bf870bfbc84d8cb527f02b95f4860e43d Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 2 Dec 2017 19:48:48 +0200 Subject: [PATCH] Fixed ConcurrentModification related to Export #437 --- .../djrapitops/plan/utilities/analysis/AnalysisUtils.java | 5 +++++ .../plan/utilities/file/export/AnalysisExport.java | 3 ++- .../djrapitops/plan/utilities/file/export/HtmlExport.java | 2 +- .../djrapitops/plan/utilities/file/export/PlayerExport.java | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java index 26b4108d2..c4776ad8c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java @@ -186,6 +186,10 @@ public class AnalysisUtils { double probability = 1.0; + if (similarM.isEmpty() && similarW.isEmpty()) { + return 0; + } + if (!similarM.isEmpty()) { int stickM = 0; for (StickyData stickyData : stickyStuckM) { @@ -206,6 +210,7 @@ public class AnalysisUtils { probability *= (stickW / similarW.size()); } + return probability; } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/AnalysisExport.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/AnalysisExport.java index 8f26d2ff8..ade092eed 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/AnalysisExport.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/AnalysisExport.java @@ -7,6 +7,7 @@ package main.java.com.djrapitops.plan.utilities.file.export; import com.djrapitops.plugin.api.utility.log.Log; import java.io.IOException; +import java.util.ConcurrentModificationException; import java.util.UUID; /** @@ -34,7 +35,7 @@ public class AnalysisExport extends SpecificExport { } finally { try { this.cancel(); - } catch (IllegalArgumentException ignore) { + } catch (ConcurrentModificationException | IllegalArgumentException ignore) { } } } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java index 91e235a49..9d82e4088 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java @@ -73,7 +73,7 @@ public class HtmlExport extends SpecificExport { } finally { try { this.cancel(); - } catch (IllegalArgumentException ignore) { + } catch (ConcurrentModificationException | IllegalArgumentException ignore) { } } } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/PlayerExport.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/PlayerExport.java index c75c056a0..16d7d1027 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/PlayerExport.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/PlayerExport.java @@ -7,6 +7,7 @@ package main.java.com.djrapitops.plan.utilities.file.export; import com.djrapitops.plugin.api.utility.log.Log; import java.io.IOException; +import java.util.ConcurrentModificationException; import java.util.UUID; /** @@ -34,7 +35,7 @@ public class PlayerExport extends SpecificExport { } finally { try { this.cancel(); - } catch (IllegalArgumentException ignore) { + } catch (ConcurrentModificationException | IllegalArgumentException ignore) { } } }