[logging-log4j2] branch master updated: [LOG4J2-2812] [JDBC] Throw a AppenderLoggingException instead of an NPE in the JDBC database manager.

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/master by this push:
     new e916a15  [LOG4J2-2812] [JDBC] Throw a AppenderLoggingException instead 
of an NPE in the JDBC database manager.
e916a15 is described below

commit e916a153e37e84156d044825d49ae5f320ba9e5c
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Apr 1 18:44:00 2020 -0400

    [LOG4J2-2812] [JDBC] Throw a AppenderLoggingException instead of an NPE
    in the JDBC database manager.
---
 .../apache/logging/log4j/jdbc/appender/JdbcDatabaseManager.java   | 8 ++++++--
 src/changes/changes.xml                                           | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcDatabaseManager.java
 
b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcDatabaseManager.java
index dfad705..6790d4b 100644
--- 
a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcDatabaseManager.java
+++ 
b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcDatabaseManager.java
@@ -677,9 +677,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 61aa5b7..2c33c04 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -190,6 +190,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">