@@ -1386,15 +1386,15 @@ public Array ReadArray(
1386
1386
switch ( builtInType )
1387
1387
{
1388
1388
case BuiltInType . Boolean :
1389
- return ReadBooleanArray ( fieldName ) . ToArray ( ) ;
1389
+ return ReadBooleanArray ( fieldName ) ? . ToArray ( ) ;
1390
1390
case BuiltInType . SByte :
1391
- return ReadSByteArray ( fieldName ) . ToArray ( ) ;
1391
+ return ReadSByteArray ( fieldName ) ? . ToArray ( ) ;
1392
1392
case BuiltInType . Byte :
1393
- return ReadByteArray ( fieldName ) . ToArray ( ) ;
1393
+ return ReadByteArray ( fieldName ) ? . ToArray ( ) ;
1394
1394
case BuiltInType . Int16 :
1395
- return ReadInt16Array ( fieldName ) . ToArray ( ) ;
1395
+ return ReadInt16Array ( fieldName ) ? . ToArray ( ) ;
1396
1396
case BuiltInType . UInt16 :
1397
- return ReadUInt16Array ( fieldName ) . ToArray ( ) ;
1397
+ return ReadUInt16Array ( fieldName ) ? . ToArray ( ) ;
1398
1398
case BuiltInType . Enumeration :
1399
1399
{
1400
1400
DetermineIEncodeableSystemType ( ref systemType , encodeableTypeId ) ;
@@ -1406,51 +1406,51 @@ public Array ReadArray(
1406
1406
goto case BuiltInType . Int32 ;
1407
1407
}
1408
1408
case BuiltInType . Int32 :
1409
- return ReadInt32Array ( fieldName ) . ToArray ( ) ;
1409
+ return ReadInt32Array ( fieldName ) ? . ToArray ( ) ;
1410
1410
case BuiltInType . UInt32 :
1411
- return ReadUInt32Array ( fieldName ) . ToArray ( ) ;
1411
+ return ReadUInt32Array ( fieldName ) ? . ToArray ( ) ;
1412
1412
case BuiltInType . Int64 :
1413
- return ReadInt64Array ( fieldName ) . ToArray ( ) ;
1413
+ return ReadInt64Array ( fieldName ) ? . ToArray ( ) ;
1414
1414
case BuiltInType . UInt64 :
1415
- return ReadUInt64Array ( fieldName ) . ToArray ( ) ;
1415
+ return ReadUInt64Array ( fieldName ) ? . ToArray ( ) ;
1416
1416
case BuiltInType . Float :
1417
- return ReadFloatArray ( fieldName ) . ToArray ( ) ;
1417
+ return ReadFloatArray ( fieldName ) ? . ToArray ( ) ;
1418
1418
case BuiltInType . Double :
1419
- return ReadDoubleArray ( fieldName ) . ToArray ( ) ;
1419
+ return ReadDoubleArray ( fieldName ) ? . ToArray ( ) ;
1420
1420
case BuiltInType . String :
1421
- return ReadStringArray ( fieldName ) . ToArray ( ) ;
1421
+ return ReadStringArray ( fieldName ) ? . ToArray ( ) ;
1422
1422
case BuiltInType . DateTime :
1423
- return ReadDateTimeArray ( fieldName ) . ToArray ( ) ;
1423
+ return ReadDateTimeArray ( fieldName ) ? . ToArray ( ) ;
1424
1424
case BuiltInType . Guid :
1425
- return ReadGuidArray ( fieldName ) . ToArray ( ) ;
1425
+ return ReadGuidArray ( fieldName ) ? . ToArray ( ) ;
1426
1426
case BuiltInType . ByteString :
1427
- return ReadByteStringArray ( fieldName ) . ToArray ( ) ;
1427
+ return ReadByteStringArray ( fieldName ) ? . ToArray ( ) ;
1428
1428
case BuiltInType . XmlElement :
1429
- return ReadXmlElementArray ( fieldName ) . ToArray ( ) ;
1429
+ return ReadXmlElementArray ( fieldName ) ? . ToArray ( ) ;
1430
1430
case BuiltInType . NodeId :
1431
- return ReadNodeIdArray ( fieldName ) . ToArray ( ) ;
1431
+ return ReadNodeIdArray ( fieldName ) ? . ToArray ( ) ;
1432
1432
case BuiltInType . ExpandedNodeId :
1433
- return ReadExpandedNodeIdArray ( fieldName ) . ToArray ( ) ;
1433
+ return ReadExpandedNodeIdArray ( fieldName ) ? . ToArray ( ) ;
1434
1434
case BuiltInType . StatusCode :
1435
- return ReadStatusCodeArray ( fieldName ) . ToArray ( ) ;
1435
+ return ReadStatusCodeArray ( fieldName ) ? . ToArray ( ) ;
1436
1436
case BuiltInType . QualifiedName :
1437
- return ReadQualifiedNameArray ( fieldName ) . ToArray ( ) ;
1437
+ return ReadQualifiedNameArray ( fieldName ) ? . ToArray ( ) ;
1438
1438
case BuiltInType . LocalizedText :
1439
- return ReadLocalizedTextArray ( fieldName ) . ToArray ( ) ;
1439
+ return ReadLocalizedTextArray ( fieldName ) ? . ToArray ( ) ;
1440
1440
case BuiltInType . DataValue :
1441
- return ReadDataValueArray ( fieldName ) . ToArray ( ) ;
1441
+ return ReadDataValueArray ( fieldName ) ? . ToArray ( ) ;
1442
1442
case BuiltInType . Variant :
1443
1443
{
1444
1444
if ( DetermineIEncodeableSystemType ( ref systemType , encodeableTypeId ) )
1445
1445
{
1446
1446
return ReadEncodeableArray ( fieldName , systemType , encodeableTypeId ) ;
1447
1447
}
1448
- return ReadVariantArray ( fieldName ) . ToArray ( ) ;
1448
+ return ReadVariantArray ( fieldName ) ? . ToArray ( ) ;
1449
1449
}
1450
1450
case BuiltInType . ExtensionObject :
1451
- return ReadExtensionObjectArray ( fieldName ) . ToArray ( ) ;
1451
+ return ReadExtensionObjectArray ( fieldName ) ? . ToArray ( ) ;
1452
1452
case BuiltInType . DiagnosticInfo :
1453
- return ReadDiagnosticInfoArray ( fieldName ) . ToArray ( ) ;
1453
+ return ReadDiagnosticInfoArray ( fieldName ) ? . ToArray ( ) ;
1454
1454
default :
1455
1455
{
1456
1456
if ( DetermineIEncodeableSystemType ( ref systemType , encodeableTypeId ) )
@@ -1604,7 +1604,7 @@ private bool DetermineIEncodeableSystemType(ref Type systemType, ExpandedNodeId
1604
1604
}
1605
1605
1606
1606
/// <summary>
1607
- /// Reads and returns an array of elements of the specified length and builtInType
1607
+ /// Reads and returns an array of elements of the specified length and builtInType
1608
1608
/// </summary>
1609
1609
private Array ReadArrayElements ( int length , BuiltInType builtInType )
1610
1610
{
0 commit comments