Correction for arrays of more than 2 dimensions
When using the type interpretation for arrays of more than 2 dimensions, on deserialization, an error is encountered. There is a problem in the switch case that does not allow adding more than one comma between the brackets of System.xxxx []. View issue #2591
This commit is contained in:
@@ -187,19 +187,30 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
// loop through the type name and filter out qualified assembly details from nested type names
|
// loop through the type name and filter out qualified assembly details from nested type names
|
||||||
bool writingAssemblyName = false;
|
bool writingAssemblyName = false;
|
||||||
bool skippingAssemblyDetails = false;
|
bool skippingAssemblyDetails = false;
|
||||||
|
bool DimensionArrayMaybe = false;
|
||||||
for (int i = 0; i < fullyQualifiedTypeName.Length; i++)
|
for (int i = 0; i < fullyQualifiedTypeName.Length; i++)
|
||||||
{
|
{
|
||||||
char current = fullyQualifiedTypeName[i];
|
char current = fullyQualifiedTypeName[i];
|
||||||
switch (current)
|
switch (current)
|
||||||
{
|
{
|
||||||
case '[':
|
case '[':
|
||||||
|
writingAssemblyName = false;
|
||||||
|
skippingAssemblyDetails = false;
|
||||||
|
DimensionArrayMaybe = true;
|
||||||
|
builder.Append(current);
|
||||||
|
break;
|
||||||
case ']':
|
case ']':
|
||||||
writingAssemblyName = false;
|
writingAssemblyName = false;
|
||||||
skippingAssemblyDetails = false;
|
skippingAssemblyDetails = false;
|
||||||
|
DimensionArrayMaybe = false;
|
||||||
builder.Append(current);
|
builder.Append(current);
|
||||||
break;
|
break;
|
||||||
case ',':
|
case ',':
|
||||||
if (!writingAssemblyName)
|
if (DimensionArrayMaybe)
|
||||||
|
{
|
||||||
|
builder.Append(current);
|
||||||
|
}
|
||||||
|
else if (!writingAssemblyName)
|
||||||
{
|
{
|
||||||
writingAssemblyName = true;
|
writingAssemblyName = true;
|
||||||
builder.Append(current);
|
builder.Append(current);
|
||||||
@@ -210,6 +221,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
DimensionArrayMaybe = false;
|
||||||
if (!skippingAssemblyDetails)
|
if (!skippingAssemblyDetails)
|
||||||
{
|
{
|
||||||
builder.Append(current);
|
builder.Append(current);
|
||||||
|
|||||||
Reference in New Issue
Block a user