Merge branch '3.8' of https://github.com/JumpMind/symmetric-ds into 3.8

JumpMind · Jul 13, 2016 · c98a5cb · c98a5cb
2 parents d90a59c + 65c4f7d
commit c98a5cb
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/JdbcSqlTemplate.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/JdbcSqlTemplate.java
@@ -517,6 +517,11 @@ public static String lookupColumnName(ResultSetMetaData resultSetMetaData, int c
         }
         return name;
     }
+
+    @Deprecated
+    public static Object getResultSetValue(ResultSet rs, int index, boolean readStringsAsBytes) throws SQLException {
+        return getResultSetValue(rs, null, index, readStringsAsBytes);
+    }
 
     /**
      * Retrieve a JDBC column value from a ResultSet, using the most appropriate
@@ -545,6 +550,9 @@ public static String lookupColumnName(ResultSetMetaData resultSetMetaData, int c
      * @see java.sql.Timestamp
      */
     public static Object getResultSetValue(ResultSet rs, ResultSetMetaData metaData, int index, boolean readStringsAsBytes) throws SQLException {
+        if (metaData == null) {
+            metaData = rs.getMetaData();
+        }
         Object obj = null;
         int jdbcType = metaData.getColumnType(index);
         String jdbcTypeName = metaData.getColumnTypeName(index);