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:10:56 UTC
[groovy] branch master updated (06dd5052ed -> 14d5a569c6)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
from 06dd5052ed GROOVY-10153: resolve implicit wildcard bounding once type resolved
new 0380002b6e GROOVY-10665: StackTraceUtils: Add 'jdk.internal' to the list of ignored packages
new 14d5a569c6 GROOVY-10665: StackTraceUtils: Add 'groovyjarjar,com.sun.,org.apache.groovy.' to the list of ignored packages
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/codehaus/groovy/runtime/StackTraceUtils.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
[groovy] 01/02: GROOVY-10665: StackTraceUtils: Add 'jdk.internal' to the list of ignored packages
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0380002b6ea5129bc240340e909efbe250fecb28
Author: Adam Lewandowski <ad...@plxis.com>
AuthorDate: Thu Jun 16 08:40:51 2022 -0400
GROOVY-10665: StackTraceUtils: Add 'jdk.internal' to the list of ignored packages
---
src/main/java/org/codehaus/groovy/runtime/StackTraceUtils.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/StackTraceUtils.java b/src/main/java/org/codehaus/groovy/runtime/StackTraceUtils.java
index 65b53a176b..2c377e322e 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StackTraceUtils.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StackTraceUtils.java
@@ -64,7 +64,8 @@ public class StackTraceUtils {
"java.," +
"javax.," +
"sun.," +
- "gjdk.groovy.,"
+ "gjdk.groovy.," +
+ "jdk.internal."
).split("(\\s|,)+");
private static final List<Closure> tests = new ArrayList<Closure>();
[groovy] 02/02: GROOVY-10665: StackTraceUtils: Add 'groovyjarjar,com.sun.,org.apache.groovy.' to the list of ignored packages
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 14d5a569c6aa64cfa8f873c6bd041d1d3a8f1635
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);