You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ck...@apache.org on 2018/07/27 03:59:05 UTC
[2/6] logging-log4j2 git commit: ThrowableProxy cleanup
ThrowableProxy cleanup
Removed a few unnecessary parameters and operations.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5eb02a1a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5eb02a1a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5eb02a1a
Branch: refs/heads/master
Commit: 5eb02a1a892506a85267f578bace8a71ec108289
Parents: ea0aef0
Author: Carter Kozak <ck...@apache.org>
Authored: Wed Jul 25 19:23:11 2018 -0400
Committer: Carter Kozak <ck...@apache.org>
Committed: Thu Jul 26 23:57:59 2018 -0400
----------------------------------------------------------------------
.../logging/log4j/core/impl/ThrowableProxy.java | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5eb02a1a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
index 73d7faf..42ed186 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
@@ -657,8 +657,7 @@ public class ThrowableProxy implements Serializable {
* @param exact True if the class was obtained via Reflection.getCallerClass.
* @return The CacheEntry.
*/
- private CacheEntry toCacheEntry(final StackTraceElement stackTraceElement, final Class<?> callerClass,
- final boolean exact) {
+ private CacheEntry toCacheEntry(final Class<?> callerClass, final boolean exact) {
String location = "?";
String version = "?";
ClassLoader lastLoader = null;
@@ -734,7 +733,7 @@ public class ThrowableProxy implements Serializable {
// present as those methods have returned.
ExtendedClassInfo extClassInfo;
if (clazz != null && className.equals(clazz.getName())) {
- final CacheEntry entry = this.toCacheEntry(stackTraceElement, clazz, true);
+ final CacheEntry entry = this.toCacheEntry(clazz, true);
extClassInfo = entry.element;
lastLoader = entry.loader;
stack.pop();
@@ -748,8 +747,7 @@ public class ThrowableProxy implements Serializable {
lastLoader = entry.loader;
}
} else {
- final CacheEntry entry = this.toCacheEntry(stackTraceElement,
- this.loadClass(lastLoader, className), false);
+ final CacheEntry entry = this.toCacheEntry(this.loadClass(lastLoader, className), false);
extClassInfo = entry.element;
map.put(className, entry);
if (entry.loader != null) {
@@ -771,17 +769,16 @@ public class ThrowableProxy implements Serializable {
private ThrowableProxy[] toSuppressedProxies(final Throwable thrown, Set<Throwable> suppressedVisited) {
try {
final Throwable[] suppressed = thrown.getSuppressed();
- if (suppressed == null) {
+ if (suppressed == null || suppressed.length == 0) {
return EMPTY_THROWABLE_PROXY_ARRAY;
}
final List<ThrowableProxy> proxies = new ArrayList<>(suppressed.length);
if (suppressedVisited == null) {
- suppressedVisited = new HashSet<>(proxies.size());
+ suppressedVisited = new HashSet<>(suppressed.length);
}
for (int i = 0; i < suppressed.length; i++) {
final Throwable candidate = suppressed[i];
- if (!suppressedVisited.contains(candidate)) {
- suppressedVisited.add(candidate);
+ if (suppressedVisited.add(candidate)) {
proxies.add(new ThrowableProxy(candidate, suppressedVisited));
}
}