Merge remote-tracking branch 'origin/devel' into devel

dbeaver · Oct 1, 2021 · db626f4 · db626f4
2 parents c5ede4c + 280fc30
commit db626f4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...r.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterCSV.java b/...r.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterCSV.java
@@ -195,12 +195,12 @@ public void exportRow(DBCSession session, DBCResultSet resultSet, Object[] row)
                     }
                 }
                 if (DBUtils.isNullValue(row[i])) {
-                    if (CommonUtils.isEmpty(nullString)) {
-                        return;
+                    if (CommonUtils.isNotEmpty(nullString)) {
+                        writeCellValue(nullString, quote);
                     }
-                    stringValue = nullString;
+                } else {
+                    writeCellValue(stringValue, quote);
                 }
-                writeCellValue(stringValue, quote);
             }
             if (i < row.length - 1) {
                 writeDelimiter();