fankes/JSON-java-compat
2
0
Fork 0
mirror of https://github.com/fankes/JSON-java-compat.git synced 2025-09-09 20:14:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed issue #943 Csv parsing skip last row if last line is missing newline

Browse Source
This commit is contained in:
marilynel
2025-03-16 12:50:58 -07:00
parent 76ee4312b3
commit b2943b8fd0
2 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/json/CDL.java
View File

@@ -100,11 +100,15 @@ public class CDL {
for (;;) {
String value = getValue(x,delimiter);
char c = x.next();
if (value == null ||
(ja.length() == 0 && value.length() == 0 && c != delimiter)) {
if (value != null) {
ja.put(value);
} else if (ja.length() == 0 && c != delimiter) {
return null;
} else {
// This line accounts for CSV ending with no newline
ja.put("");
}
ja.put(value);
for (;;) {
if (c == delimiter) {
break;
@@ -307,6 +311,17 @@ public class CDL {
if (ja.length() == 0) {
return null;
}
// The following block accounts for empty datasets (no keys or vals)
if (ja.length() == 1) {
JSONObject j = ja.getJSONObject(0);
if (j.length() == 1) {
String key = j.keys().next();
if ("".equals(key) && "".equals(j.get(key))) {
return null;
}
}
}
return ja;
}