Skip to content

Commit 189670b

Browse files
committed
Fix java.lang.NullPointerException in CsvTableEditor.generateCsv
1 parent ba857e8 commit 189670b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ protected String sanitizeFieldValue(Object value) {
163163
}
164164

165165
protected String generateCsv(Object[][] data) {
166+
CsvColumnInfoMap columnInfoMap = getColumnInfoMap();
167+
boolean newLineAtEnd = CsvEditorSettings.getInstance().isFileEndLineBreak() && (columnInfoMap == null || columnInfoMap.hasEmptyLastLine());
166168
StringBuilder result = new StringBuilder();
167169
for (int row = 0; row < data.length; ++row) {
168170
for (int column = 0; column < data[row].length; ++column) {
@@ -172,8 +174,7 @@ protected String generateCsv(Object[][] data) {
172174
result.append(this.currentSeparator.getCharacter());
173175
}
174176
}
175-
if (row < data.length - 1 ||
176-
(CsvEditorSettings.getInstance().isFileEndLineBreak() && getColumnInfoMap().hasEmptyLastLine())) {
177+
if (row < data.length - 1 || newLineAtEnd) {
177178
result.append("\n");
178179
}
179180
}

0 commit comments

Comments
 (0)