s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issue #1509

Browse Source
This commit is contained in:
Jacky 2018-02-23 11:15:56 -05:00 committed by GitHub
parent b51dbdcbf2
commit 32c5838a8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/src/com/google/refine/importing/ImportingUtilities.java
View File

@ -92,6 +92,7 @@ import com.google.refine.ProjectManager;
import com.google.refine.RefineServlet; import com.google.refine.RefineServlet;
import com.google.refine.importing.ImportingManager.Format; import com.google.refine.importing.ImportingManager.Format;
import com.google.refine.importing.UrlRewriter.Result; import com.google.refine.importing.UrlRewriter.Result;
import com.google.refine.model.Cell;
import com.google.refine.model.Column; import com.google.refine.model.Column;
import com.google.refine.model.ColumnModel; import com.google.refine.model.ColumnModel;
import com.google.refine.model.Project; import com.google.refine.model.Project;
@ -1131,8 +1132,19 @@ public class ImportingUtilities {
List<Row> rows = project.rows List<Row> rows = project.rows
.stream() .stream()
.limit(INFER_ROW_LIMIT) .limit(INFER_ROW_LIMIT)
.map(Row::dup)
.collect(Collectors.toList()); .collect(Collectors.toList());
rows.forEach(r->listCells.add(r.cells.toArray())); // convert the null object to prevent the NPE
for (Row row : rows) {
for (int i = 0; i < row.cells.size(); i++) {
Cell cell = row.cells.get(i);
if (cell == null) {
row.cells.set(i, new Cell(StringUtils.EMPTY, null));
}
}
listCells.add(row.cells.toArray());
}
try { try {
JSONObject fieldsJSON = TypeInferrer.getInstance().infer(listCells, JSONObject fieldsJSON = TypeInferrer.getInstance().infer(listCells,
project.columnModel.getColumnNames().toArray(new String[0]), project.columnModel.getColumnNames().toArray(new String[0]),