CSPACE-5727: Added null value checks to debugging-related method in JDBCTools.

diff --git a/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java b/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
index 377f2777f640c52d12d9303d8eff3a4599cee258..13ed43a2dede41c8c907646e384cd9e5daf62ede 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
@@ -29,6 +29,7 @@ import javax.naming.NamingException;
 import javax.sql.DataSource;\r
 import java.sql.DatabaseMetaData;\r
 import java.sql.Connection;\r
+import java.sql.ResultSet;\r
 import java.sql.ResultSetMetaData;\r
 import java.sql.SQLException;\r
 import java.sql.Statement;\r
@@ -361,7 +362,13 @@ public class JDBCTools {
      * @throws SQLException \r
      */\r
     public void printResultSetMetaData(ResultSet rs) throws SQLException {\r
+        if (rs == null) {\r
+            return;\r
+        }\r
         ResultSetMetaData metadata = rs.getMetaData();\r
+        if (metadata == null) {\r
+            return;\r
+        }\r
         int numberOfColumns = metadata.getColumnCount();\r
         for (int i = 1; i <= numberOfColumns; i++) {\r
             logger.debug(metadata.getColumnName(i));\r