SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix timings task name generation for extreme cases - Fixes #3499

Browse Source 
I'm going make a class, and in that class i'm going to
make a method. And in that method, I'm going to make a local class.

And then in that local class, I'm going to make another inner class.

I heard you like complex class trees.
This commit is contained in:
Aikar
2020-06-08 12:22:40 -04:00
parent 5ba1921c99
commit 5c048e9ae3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,13 +81,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ final String taskname = taskNameCache.computeIfAbsent(taskClass, clazz -> { + final String taskname = taskNameCache.computeIfAbsent(taskClass, clazz -> {
+ try { + try {
+ String clsName = clazz.isAnonymousClass() || clazz.isLocalClass() + String clsName = !clazz.isMemberClass()
+ ? clazz.getName() + ? clazz.getName()
+ : clazz.getCanonicalName(); + : clazz.getCanonicalName();
+ if (clsName.contains("$Lambda$")) { + if (clsName != null && clsName.contains("$Lambda$")) {
+ clsName = clsName.replaceAll("(Lambda\\$.*?)/.*", "$1"); + clsName = clsName.replaceAll("(Lambda\\$.*?)/.*", "$1");
+ } + }
+ return clsName; + return clsName != null ? clsName : "UnknownTask";
+ } catch (Throwable ex) { + } catch (Throwable ex) {
+ new Exception("Error occurred detecting class name", ex).printStackTrace(); + new Exception("Error occurred detecting class name", ex).printStackTrace();
+ return "MangledClassFile"; + return "MangledClassFile";