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
56db9a00
Commit
56db9a00
authored
6 years ago
by
Gary Gregory
Browse files
Options
Download
Email Patches
Plain Diff
[LOG4J2-2508] JDBC Appender fails when using both parameter, source, and
literal ColumnMapping elements.
parent
8025e3fa
release-2.x
CVE-creation-process
LOG4J2-2644-2.x
LOG4J2-2829
LOG4J2-2948
LOG4J2-2993
LOG4J2-3004
LOG4J2-3020
LOG4J2-3051
LOG4J2-3056
LOG4J2-3075
LOG4J2-3080
LOG4J2-3116
LOG4J2-3185
LOG4J2-3301
LOG4J2-3368
LOG4J2-3393
LOG4J2-913
api-separation-documentation
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/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/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.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.8.4
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-scm-plugin-1.12.2
dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.12.0
dependabot/maven/org.apache.tomcat-tomcat-catalina-10.0.14
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-utils-3.4.1
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.1.2
dependabot/maven/slf4jVersion-1.7.36
dependabot/maven/spring-boot.version-2.6.2
dependabot/maven/xmlunitVersion-2.9.0
ldap-controls
log4j-2.12
log4j-2.17.1-site
new-iso-date-time-formats
release-2.12.x/LOG4J2-3242
slf4j-2.0
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
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
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
+11
-8
...ging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
src/changes/changes.xml
+3
-0
src/changes/changes.xml
with
14 additions
and
8 deletions
+14
-8
log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
+
11
-
8
View file @
56db9a00
...
...
@@ -482,15 +482,18 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
final
String
simpleName
=
statement
.
getClass
().
getName
();
int
i
=
1
;
// JDBC indices start at 1
for
(
final
ColumnMapping
mapping
:
this
.
factoryData
.
columnMappings
)
{
final
String
source
=
mapping
.
getSource
();
final
String
key
=
Strings
.
isEmpty
(
source
)
?
mapping
.
getName
()
:
source
;
final
Object
value
=
map
.
getValue
(
key
);
if
(
logger
().
isTraceEnabled
())
{
final
String
valueStr
=
value
instanceof
String
?
"\""
+
value
+
"\""
:
Objects
.
toString
(
value
,
null
);
logger
().
trace
(
"{} setObject({}, {}) for key '{}' and mapping '{}'"
,
simpleName
,
i
,
valueStr
,
key
,
mapping
.
getName
());
if
(
mapping
.
getLiteralValue
()
==
null
)
{
final
String
source
=
mapping
.
getSource
();
final
String
key
=
Strings
.
isEmpty
(
source
)
?
mapping
.
getName
()
:
source
;
final
Object
value
=
map
.
getValue
(
key
);
if
(
logger
().
isTraceEnabled
())
{
final
String
valueStr
=
value
instanceof
String
?
"\""
+
value
+
"\""
:
Objects
.
toString
(
value
,
null
);
logger
().
trace
(
"{} setObject({}, {}) for key '{}' and mapping '{}'"
,
simpleName
,
i
,
valueStr
,
key
,
mapping
.
getName
());
}
statement
.
setObject
(
i
++,
value
);
}
statement
.
setObject
(
i
++,
value
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/changes/changes.xml
+
3
-
0
View file @
56db9a00
...
...
@@ -127,6 +127,9 @@
<action
issue=
"LOG4J2-2505"
dev=
"ggregory"
type=
"add"
>
Let JDBC PoolingDriverConnectionSource with Apache Commons DBCP configure a PoolableConnectionFactory.
</action>
<action
issue=
"LOG4J2-2508"
dev=
"ggregory"
type=
"fix"
>
JDBC Appender fails when using both parameter, source, and literal ColumnMapping elements.
</action>
</release>
<release
version=
"2.11.1"
date=
"2018-07-22"
description=
"GA Release 2.11.1"
>
<action
issue=
"LOG4J2-2389"
dev=
"rgoers"
type=
"fix"
due-to=
"Liu Wen"
>
...
...
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