Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-08 17:27:41 +01:00
Code Issues Projects Releases Wiki Activity

Ensure that TimedEventExecutor timings are closed (Fixes #1918)

Browse Source 
pre this, any event handler firing an exception would leave the timings
open, causing the timings stack to be corrupted
This commit is contained in:
Shane Freeder 2019-03-26 00:55:29 +00:00
parent 973a062bb9
commit e8b836dec8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-API-Patches/Timings-v2.patch
View File

@ -169,7 +169,7 @@ index 000000000..8e0cd40e8
+} +}
diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
new file mode 100644 new file mode 100644
index 000000000..68f7866e1 index 000000000..933ecf9bd
--- /dev/null --- /dev/null
+++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@ -251,9 +251,9 @@ index 000000000..68f7866e1
+ executor.execute(listener, event); + executor.execute(listener, event);
+ return; + return;
+ } + }
+ timings.startTiming(); + try (Timing ignored = timings.startTiming()){
+ executor.execute(listener, event); + executor.execute(listener, event);
+ timings.stopTiming(); + }
+ } + }
+} +}
diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java