0001168: Audit router throws NPE on Oracle and PostgreSQL.

JumpMind · Apr 8, 2013 · f49b786 · f49b786
1 parent 92dcb13
commit f49b786
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDmlStatement.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDmlStatement.java
@@ -22,7 +22,7 @@ public void appendColumnQuestions(StringBuilder sql, Column[] columns) {
                 if (columns[i].getMappedTypeCode() == -101) {
                     sql.append("TO_TIMESTAMP_TZ(?, 'YYYY-MM-DD HH24:MI:SS.FF TZH:TZM')")
                             .append(",");
-                } else if (columns[i].getJdbcTypeName().toUpperCase().contains(TypeMap.GEOMETRY)) {
+                } else if (columns[i].getJdbcTypeName() != null && columns[i].getJdbcTypeName().toUpperCase().contains(TypeMap.GEOMETRY)) {
                     sql.append("SYM_WKT2GEOM(?)").append(",");
                 } else {
                     sql.append("?").append(",");

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlDmlStatement.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlDmlStatement.java
@@ -78,7 +78,7 @@ public <T> T[] getValueArray(T[] columnValues, T[] keyValues) {
             return super.getValueArray(columnValues, keyValues);
         }
     }
-    
+
     @Override
     public Object[] getValueArray(Map<String, Object> params) {
         Object[] args = null;
@@ -109,19 +109,19 @@ protected int[] buildTypes(Column[] keys, Column[] columns, boolean isDateOverri
             return super.buildTypes(keys, columns, isDateOverrideToTimestamp);
         }
     }
-    
+
     @Override
     public void appendColumnQuestions(StringBuilder sql, Column[] columns) {
         for (int i = 0; i < columns.length; i++) {
             if (columns[i] != null) {
                 if (columns[i].getMappedTypeCode() == -101) {
                     sql.append("cast(? as timestamp with time zone)").append(",");
-                } else if (columns[i].getJdbcTypeName().toUpperCase().contains(TypeMap.UUID)) {
+                } else if (columns[i].getJdbcTypeName() != null && columns[i].getJdbcTypeName().toUpperCase().contains(TypeMap.UUID)) {
                     sql.append("cast(? as uuid)").append(",");
-                } else if (columns[i].getJdbcTypeName().toUpperCase().contains(TypeMap.VARBIT)) {
+                } else if (columns[i].getJdbcTypeName() != null && columns[i].getJdbcTypeName().toUpperCase().contains(TypeMap.VARBIT)) {
                     sql.append("cast(? as bit varying)").append(",");
-                } else if (columns[i].getJdbcTypeName().toUpperCase().contains(TypeMap.INTERVAL)) {
-                    sql.append("cast(? as interval)").append(",");                    
+                } else if (columns[i].getJdbcTypeName() != null && columns[i].getJdbcTypeName().toUpperCase().contains(TypeMap.INTERVAL)) {
+                    sql.append("cast(? as interval)").append(",");
                 } else {
                     sql.append("?").append(",");
                 }
@@ -151,7 +151,7 @@ public void appendColumnEquals(StringBuilder sql, Column[] columns, boolean[] nu
                             .append(" = cast(? as bit varying)").append(separator);
                 } else if (columns[i].getJdbcTypeName().toUpperCase().contains(TypeMap.INTERVAL)) {
                     sql.append(quote).append(columns[i].getName()).append(quote)
-                          .append(" = cast(? as interval)").append(separator);                      
+                          .append(" = cast(? as interval)").append(separator);
                 } else {
                     sql.append(quote).append(columns[i].getName()).append(quote).append(" = ?")
                             .append(separator);
@@ -163,7 +163,7 @@ public void appendColumnEquals(StringBuilder sql, Column[] columns, boolean[] nu
             sql.replace(sql.length() - separator.length(), sql.length(), "");
         }
     }
-    
+
     @Override
     protected void appendColumnNameForSql(StringBuilder sql, Column column, boolean select) {
         String columnName = column.getName();
@@ -181,7 +181,7 @@ protected void appendColumnNameForSql(StringBuilder sql, Column column, boolean
             "   end as ").append(columnName);
         } else {
             super.appendColumnNameForSql(sql, column, select);
-        }        
+        }
     }
 
 }