Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
Logging Log4j2
Commits
311101cb
Commit
311101cb
authored
8 years ago
by
Ralph Goers
Browse files
Options
Download
Email Patches
Plain Diff
LOG4J2-1359 - Remove print statement
parent
8eac9102
release-2.x
CVE-creation-process
GenericMapMessage
GenericMapMessageSimple
LOG4J2-1359
LOG4J2-1694
LOG4J2-1888
LOG4J2-1889
LOG4J2-1949
LOG4J2-1986-b
LOG4J2-2163
LOG4J2-2266
LOG4J2-2621
LOG4J2-2644-2.x
LOG4J2-2829
LOG4J2-2948
LOG4J2-2993
LOG4J2-3003
LOG4J2-3004
LOG4J2-3020
LOG4J2-3051
LOG4J2-3056
LOG4J2-3075
LOG4J2-3080
LOG4J2-3116
LOG4J2-3185
LOG4J2-3301
LOG4J2-3368
LOG4J2-3393
LOG4J2-3644-3.x
LOG4J2-913
Lucene5
android
api-separation-documentation
ckozak/stack_trace_jmh_benchmark
dependabot/docker/openjdk-16
dependabot/docker/openjdk-17
dependabot/github_actions/actions/setup-java-2.1.0
dependabot/github_actions/actions/setup-java-2.2.0
dependabot/github_actions/actions/setup-java-2.3.0
dependabot/github_actions/actions/setup-java-2.3.1
dependabot/github_actions/actions/setup-java-2.4.0
dependabot/maven/byteBuddyVersion-1.12.1
dependabot/maven/com.conversantmedia-disruptor-1.2.17
dependabot/maven/com.conversantmedia-disruptor-1.2.19
dependabot/maven/com.github.spotbugs-spotbugs-4.5.0
dependabot/maven/com.github.tomakehurst-wiremock-2.27.1
dependabot/maven/com.github.tomakehurst-wiremock-2.27.2
dependabot/maven/com.h2database-h2-2.0.206
dependabot/maven/com.h2database-h2-2.1.210
dependabot/maven/com.h2database-h2-2.1.212
dependabot/maven/com.sleepycat-je-18.3.12
dependabot/maven/de.flapdoodle.embed-de.flapdoodle.embed.mongo-3.3.1
dependabot/maven/de.flapdoodle.embed-de.flapdoodle.embed.mongo-3.4.5
dependabot/maven/io.fabric8-docker-maven-plugin-0.39.0
dependabot/maven/io.fabric8-kubernetes-client-5.11.2
dependabot/maven/javax.servlet-javax.servlet-api-4.0.1
dependabot/maven/jmh.version-1.34
dependabot/maven/junit-junit-4.13
dependabot/maven/junit-junit-4.13.1
dependabot/maven/log4j-cassandra/org.apache.cassandra-cassandra-all-3.0.26
dependabot/maven/logbackVersion-1.2.10
dependabot/maven/mockitoVersion-4.3.1
dependabot/maven/mongodb3.version-3.12.10
dependabot/maven/mongodb3.version-3.12.5
dependabot/maven/net.javacrumbs.json-unit-json-unit-2.31.0
dependabot/maven/org.apache.activemq-activemq-broker-5.17.0
dependabot/maven/org.apache.activemq-activemq-broker-5.17.1
dependabot/maven/org.apache.commons-commons-compress-1.20
dependabot/maven/org.apache.felix-maven-bundle-plugin-5.1.4
dependabot/maven/org.apache.felix-maven-bundle-plugin-5.1.5
dependabot/maven/org.apache.felix-org.apache.felix.framework-7.0.3
dependabot/maven/org.apache.kafka-kafka-clients-3.0.0
dependabot/maven/org.apache.kafka-kafka-clients-3.1.0
dependabot/maven/org.apache.maven-maven-core-3.6.3
dependabot/maven/org.apache.maven-maven-core-3.8.1
dependabot/maven/org.apache.maven-maven-core-3.8.2
dependabot/maven/org.apache.maven-maven-core-3.8.4
dependabot/maven/org.apache.maven.plugins-maven-checkstyle-plugin-3.1.1
dependabot/maven/org.apache.maven.plugins-maven-checkstyle-plugin-3.1.2
dependabot/maven/org.apache.maven.plugins-maven-pdf-plugin-1.6.0
dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.2.2
dependabot/maven/org.apache.maven.plugins-maven-resources-plugin-3.1.0
dependabot/maven/org.apache.maven.plugins-maven-resources-plugin-3.2.0
dependabot/maven/org.apache.maven.plugins-maven-scm-plugin-1.12.2
dependabot/maven/org.apache.maven.plugins-maven-shade-plugin-3.2.4
dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.12.0
dependabot/maven/org.apache.tomcat-tomcat-catalina-10.0.0
dependabot/maven/org.apache.tomcat-tomcat-catalina-10.0.10
dependabot/maven/org.apache.tomcat-tomcat-catalina-10.0.11
dependabot/maven/org.apache.tomcat-tomcat-catalina-10.0.14
dependabot/maven/org.apache.tomcat-tomcat-catalina-10.0.2
dependabot/maven/org.apache.tomcat-tomcat-catalina-10.0.4
dependabot/maven/org.apache.tomcat-tomcat-catalina-10.0.5
dependabot/maven/org.apache.tomcat-tomcat-catalina-10.0.6
dependabot/maven/org.apache.tomcat-tomcat-catalina-10.0.7
dependabot/maven/org.apache.tomcat-tomcat-catalina-10.0.8
dependabot/maven/org.apache.tomcat-tomcat-catalina-9.0.37
dependabot/maven/org.apache.tomcat-tomcat-catalina-9.0.38
dependabot/maven/org.apache.tomcat-tomcat-catalina-9.0.39
dependabot/maven/org.awaitility-awaitility-4.1.1
dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.2.0
dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.3.0
dependabot/maven/org.codehaus.plexus-plexus-compiler-javac-errorprone-2.8.7
dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.1
dependabot/maven/org.eclipse.jetty-jetty-util-9.4.30.v20200611
dependabot/maven/org.eclipse.jetty-jetty-util-9.4.31.v20200723
dependabot/maven/org.jctools-jctools-core-3.0.0
dependabot/maven/org.jctools-jctools-core-3.1.0
dependabot/maven/org.lightcouch-lightcouch-0.2.0
dependabot/maven/org.liquibase-liquibase-core-3.10.3
dependabot/maven/org.liquibase-liquibase-core-4.6.2
dependabot/maven/org.liquibase-liquibase-core-4.7.0
dependabot/maven/org.springframework.ws-spring-ws-core-3.0.10.RELEASE
dependabot/maven/org.springframework.ws-spring-ws-core-3.0.9.RELEASE
dependabot/maven/org.springframework.ws-spring-ws-core-3.1.1
dependabot/maven/org.springframework.ws-spring-ws-core-3.1.2
dependabot/maven/org.xmlunit-xmlunit-core-2.7.0
dependabot/maven/org.xmlunit-xmlunit-core-2.8.0
dependabot/maven/org.xmlunit-xmlunit-core-2.8.2
dependabot/maven/org.xmlunit-xmlunit-core-2.8.3
dependabot/maven/slf4jVersion-1.7.36
dependabot/maven/spring-boot.version-2.6.0
dependabot/maven/spring-boot.version-2.6.2
dependabot/maven/springVersion-5.2.7.RELEASE
dependabot/maven/springVersion-5.2.8.RELEASE
dependabot/maven/xmlunitVersion-2.9.0
java9NoMultiRelease
jpms-mockito-fails
ldap-controls
log4j-2.11.1-patches
log4j-2.12
log4j-2.17.1-site
master
master-java11
mean-bean-machine
module-compile-fails
new-iso-date-time-formats
pr/513
release-2.12.x/LOG4J2-3242
revert-276-patch-1
slf4j-2.0
travis-test
rel/2.17.2
rel/2.17.1
rel/2.17.0
rel/2.16.0
rel/2.15.0
rel/2.14.1
rel/2.14.0
rel/2.13.3
rel/2.13.2
rel/2.13.1
rel/2.13.0
rel/2.12.4
rel/2.12.3
rel/2.12.2
rel/2.12.1
rel/2.12.0
rel/2.11.2
rel/2.11.1
rel/2.11.0
rel/2.10.0
rel/2.9.0
log4j-2.17.2-rc1
log4j-2.17.1-rc1
log4j-2.17.0-rc1
log4j-2.16.0-rc1
log4j-2.15.1-rc1
log4j-2.15.0-rc2
log4j-2.15.0-rc1
log4j-2.14.1-rc1
log4j-2.14.0-rc1
log4j-2.13.3
log4j-2.13.3-rc1
log4j-2.13.2
log4j-2.13.2-rc1
log4j-2.13.1
log4j-2.13.1-rc2
log4j-2.13.1-rc1
log4j-2.13.0-rc2
log4j-2.13.0-rc1
log4j-2.12.4-rc1
log4j-2.12.3-rc1
log4j-2.12.2-rc1
log4j-2.12.1
log4j-2.12.1-rc1
log4j-2.12.0
log4j-2.12.0-rc2
log4j-2.12.0-rc1
log4j-2.11.2
log4j-2.11.2-rc3
log4j-2.11.2-rc2
log4j-2.11.2-rc1
log4j-2.11.1
log4j-2.11.1-rc1
log4j-2.11.0
log4j-2.11.0-rc1
log4j-2.10.0
log4j-2.10-rc1
log4j-2.9.1-rc1
log4j-2.9.0
log4j-2.9-rc1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java
+0
-1
...in/java/org/apache/logging/log4j/util/ReflectionUtil.java
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/LocationLocator.java
+0
-5
...a/org/apache/logging/log4j/core/impl/LocationLocator.java
log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4jLogEventBenchmark.java
+11
-5
...apache/logging/log4j/perf/jmh/Log4jLogEventBenchmark.java
with
11 additions
and
11 deletions
+11
-11
log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java
+
0
-
1
View file @
311101cb
...
...
@@ -61,7 +61,6 @@ public final class ReflectionUtil {
static
{
Method
getCallerClass
;
int
java7u25CompensationOffset
=
0
;
System
.
out
.
println
(
"Using Java 7 ReflectionUtil"
);
try
{
final
Class
<?>
sunReflectionClass
=
LoaderUtil
.
loadClass
(
"sun.reflect.Reflection"
);
getCallerClass
=
sunReflectionClass
.
getDeclaredMethod
(
"getCallerClass"
,
int
.
class
);
...
...
This diff is collapsed.
Click to expand it.
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/LocationLocator.java
+
0
-
5
View file @
311101cb
...
...
@@ -21,11 +21,6 @@ package org.apache.logging.log4j.core.impl;
*/
public
class
LocationLocator
{
static
{
System
.
out
.
println
(
"Using Java 7 Locator"
);
}
public
static
StackTraceElement
calcLocation
(
final
String
fqcnOfLogger
)
{
if
(
fqcnOfLogger
==
null
)
{
return
null
;
...
...
This diff is collapsed.
Click to expand it.
log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4jLogEventBenchmark.java
+
11
-
5
View file @
311101cb
...
...
@@ -70,21 +70,27 @@ public class Log4jLogEventBenchmark {
}
@Benchmark
public
Serializable
createSerializableLogEventProxyWithoutException
()
{
public
Serializable
createSerializableLogEventProxyWithoutException
(
final
Blackhole
bh
)
{
final
Log4jLogEvent
event
=
new
Log4jLogEvent
(
"a.b.c"
,
null
,
"a.b.c"
,
Level
.
INFO
,
MESSAGE
,
null
,
null
);
return
Log4jLogEvent
.
serialize
(
event
,
false
);
Serializable
obj
=
Log4jLogEvent
.
serialize
(
event
,
false
);
bh
.
consume
(
obj
);
return
obj
;
}
@Benchmark
public
Serializable
createSerializableLogEventProxyWithoutExceptionWithLocation
()
{
public
Serializable
createSerializableLogEventProxyWithoutExceptionWithLocation
(
final
Blackhole
bh
)
{
final
Log4jLogEvent
event
=
new
Log4jLogEvent
(
"a.b.c"
,
null
,
"a.b.c"
,
Level
.
INFO
,
MESSAGE
,
null
,
null
);
return
Log4jLogEvent
.
serialize
(
event
,
true
);
Serializable
obj
=
Log4jLogEvent
.
serialize
(
event
,
true
);
bh
.
consume
(
obj
);
return
obj
;
}
@Benchmark
public
Serializable
createSerializableLogEventProxyWithException
(
final
Blackhole
bh
)
{
final
Log4jLogEvent
event
=
new
Log4jLogEvent
(
"a.b.c"
,
null
,
"a.b.c"
,
Level
.
INFO
,
MESSAGE
,
null
,
ERROR
);
return
Log4jLogEvent
.
serialize
(
event
,
false
);
Serializable
obj
=
Log4jLogEvent
.
serialize
(
event
,
false
);
bh
.
consume
(
obj
);
return
obj
;
}
private
static
class
TestClass
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help