You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2020/04/01 22:40:40 UTC
[logging-log4j2] branch release-2.x updated: [LOG4J2-2812] [JDBC]
Throw a AppenderLoggingException instead of an NPE in the JDBC database
manager.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 3325568 [LOG4J2-2812] [JDBC] Throw a AppenderLoggingException instead of an NPE in the JDBC database manager.
3325568 is described below
commit 33255684da44dd4b412016cf05fb83a7727b867c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Apr 1 18:40:34 2020 -0400
[LOG4J2-2812] [JDBC] Throw a AppenderLoggingException instead of an NPE
in the JDBC database manager.
---
.../logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java | 8 ++++++--
src/changes/changes.xml | 3 +++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
index b52f544..7a598a7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
@@ -747,9 +747,13 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
* Sets the given Object in the prepared statement. The value is truncated if needed.
*/
private void setStatementObject(final int j, final String nameKey, final Object value) throws SQLException {
+ if (statement == null) {
+ throw new AppenderLoggingException("Cannot set a value when the PreparedStatement is null.");
+ }
if (value == null) {
- // [LOG4J2-2762] [JDBC] MS-SQL Server JDBC driver throws SQLServerException when inserting a null value for a VARBINARY column.
- // Calling setNull() instead of setObject() for null values fixes [LOG4J2-2762].
+ // [LOG4J2-2762] [JDBC] MS-SQL Server JDBC driver throws SQLServerException when
+ // inserting a null value for a VARBINARY column.
+ // Calling setNull() instead of setObject() for null values fixes [LOG4J2-2762].
this.statement.setNull(j, columnMetaData.get(nameKey).getType());
} else {
statement.setObject(j, truncate(nameKey, value));
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 10f7bcc..d52f022 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -51,6 +51,9 @@
<action issue="LOG4J2-2779" dev="rgoers" type="update">
Add ContextDataProviders as an alternative to having to implement a ContextDataInjector.
</action>
+ <action issue="LOG4J2-2812" dev="ggregory" type="update">
+ [JDBC] Throw a AppenderLoggingException instead of an NPE in the JDBC database manager.
+ </action>
</release>
<release version="2.13.1" date="2020-02-25" description="GA Release 2.13.1">
<action issue="LOG4J2-2717" dev="rgoers" type="fix">