From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 14 Dec 2012 21:22:05 +0000 (-0800)
Subject: CSPACE-5727: Added null value checks to debugging-related method in JDBCTools.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=8b648a986cabdd6836ab830701f56a70ed2e0600;p=tmp%2Fjakarta-migration.git

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 377f2777f..13ed43a2d 100644
--- 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;
 import java.sql.DatabaseMetaData;
 import java.sql.Connection;
+import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -361,7 +362,13 @@ public class JDBCTools {
      * @throws SQLException 
      */
     public void printResultSetMetaData(ResultSet rs) throws SQLException {
+        if (rs == null) {
+            return;
+        }
         ResultSetMetaData metadata = rs.getMetaData();
+        if (metadata == null) {
+            return;
+        }
         int numberOfColumns = metadata.getColumnCount();
         for (int i = 1; i <= numberOfColumns; i++) {
             logger.debug(metadata.getColumnName(i));