0001277: NPE during conflict resolution (use_version -> newer_wins)

JumpMind · Jun 13, 2013 · 8089a0a · 8089a0a
1 parent 1c032ae
commit 8089a0a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...ain/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java b/...ain/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java
@@ -293,10 +293,14 @@ protected boolean isVersionNewer(Conflict conflict, DatabaseWriter writer, CsvDa
         String sql = stmt.getColumnsSql(new Column[] { targetTable.getColumnWithName(columnName) });
         Long existingVersion = writer.getTransaction()
                 .queryForObject(sql, Long.class, objectValues);
-        Map<String, String> newData = data.toColumnNameValuePairs(sourceTable.getColumnNames(),
-                CsvData.ROW_DATA);
-        Long loadingVersion = Long.valueOf(newData.get(columnName));
-        return loadingVersion > existingVersion;
+        if (existingVersion == null) {
+            return true;
+        } else {
+            Map<String, String> newData = data.toColumnNameValuePairs(sourceTable.getColumnNames(),
+                    CsvData.ROW_DATA);
+            Long loadingVersion = Long.valueOf(newData.get(columnName));
+            return loadingVersion > existingVersion;
+        }
     }
 
     protected void performFallbackToUpdate(DatabaseWriter writer, CsvData data, Conflict conflict, boolean retransform) {