You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/06/24 07:42:23 UTC
[groovy] 05/05: GROOVY-10665: StackTraceUtils: Add 'groovyjarjar,com.sun.,org.apache.groovy.' to the list of ignored packages
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit e144b72db80383056590065355cf687078f57870
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Jun 24 17:10:47 2022 +1000
GROOVY-10665: StackTraceUtils: Add 'groovyjarjar,com.sun.,org.apache.groovy.' to the list of ignored packages
---
.../java/org/codehaus/groovy/runtime/StackTraceUtils.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/StackTraceUtils.java b/src/main/java/org/codehaus/groovy/runtime/StackTraceUtils.java
index 2c377e322e..7c86b95146 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StackTraceUtils.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StackTraceUtils.java
@@ -37,6 +37,7 @@ import java.util.logging.Logger;
* @since 1.5
*/
public class StackTraceUtils {
+ private StackTraceUtils() {}
public static final String STACK_LOG_NAME = "StackTrace";
private static final Logger STACK_LOG;
@@ -45,7 +46,7 @@ public class StackTraceUtils {
static {
outer:
do {
- Enumeration existingLogs = LogManager.getLogManager().getLoggerNames();
+ Enumeration<String> existingLogs = LogManager.getLogManager().getLoggerNames();
while (existingLogs.hasMoreElements()) {
if (STACK_LOG_NAME.equals(existingLogs.nextElement())) {
STACK_LOG = Logger.getLogger(STACK_LOG_NAME);
@@ -65,10 +66,13 @@ public class StackTraceUtils {
"javax.," +
"sun.," +
"gjdk.groovy.," +
+ "groovyjarjar," +
+ "com.sun.," +
+ "org.apache.groovy.," +
"jdk.internal."
- ).split("(\\s|,)+");
+ ).split("[\\s,]+");
- private static final List<Closure> tests = new ArrayList<Closure>();
+ private static final List<Closure> tests = new ArrayList<>();
/**
* Adds a groovy.lang.Closure to test whether the stack trace
@@ -103,7 +107,7 @@ public class StackTraceUtils {
// Note that this getBoolean access may well be synced...
if (!SystemUtil.getBooleanSafe("groovy.full.stacktrace")) {
StackTraceElement[] trace = t.getStackTrace();
- List<StackTraceElement> newTrace = new ArrayList<StackTraceElement>();
+ List<StackTraceElement> newTrace = new ArrayList<>();
for (StackTraceElement stackTraceElement : trace) {
if (isApplicationClass(stackTraceElement.getClassName())) {
newTrace.add(stackTraceElement);