simple_10925.patch
| new/src/com/goldencode/p2j/persist/serial/JsonImport.java 2025-11-25 07:47:50 +0000 | ||
|---|---|---|
| 65 | 65 |
** populated by fillFromParent() |
| 66 | 66 |
** 023 PBB 20250922 Fixed the errors thrown bt READ-JSON to match 4GL error messages. |
| 67 | 67 |
** 023 CA 20251105 Fixes for H020 - if a structured exception is caught, re-throw it. |
| 68 |
** 024 PBB 20251125 Ignore the name of the dataset if present in the input if dataset is declared with |
|
| 69 |
** SERIALIZE-HIDDEN. |
|
| 68 | 70 |
*/ |
| 69 | 71 | |
| 70 | 72 |
/* |
| ... | ... | |
| 1065 | 1067 |
|
| 1066 | 1068 |
String tableName = null; |
| 1067 | 1069 |
JsonToken tok = parser.currentToken(); |
| 1070 |
if (dsHidden && tok == FIELD_NAME) |
|
| 1071 |
{
|
|
| 1072 |
// allow reading the dataset serialize name even if it's declared with SERIALIZE-HIDDEN |
|
| 1073 |
String name = parser.currentName(); |
|
| 1074 |
if (name.equalsIgnoreCase(ds.getSerializeName().toJavaType()) || name.equalsIgnoreCase(ds._name())) |
|
| 1075 |
{
|
|
| 1076 |
tok = parser.nextToken(); |
|
| 1077 |
} |
|
| 1078 |
} |
|
| 1079 | ||
| 1068 | 1080 |
while ((dsHidden && tok != null) || (tok = parser.nextToken()) != null) |
| 1069 | 1081 |
{
|
| 1070 | 1082 |
// if DATASET:SERIALIZE-HIDDEN, allow to read the table name without advancing the parser |