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

sync with master

Browse Source
This commit is contained in:
Jacky 2018-03-06 19:28:28 -05:00
parent cf573f37de
commit 460fa611f1
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,6 @@ 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;
@ -1133,17 +1132,7 @@ public class ImportingUtilities {
.stream() .stream()
.limit(INFER_ROW_LIMIT) .limit(INFER_ROW_LIMIT)
.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]),