Skip to content

Fixing potential null in some iterations. #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jsgoupil wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing potential null in some iterations. #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1932561
Fixing potential null in some iterations.
jsgoupil Jun 21, 2021
0cc6b68
Bumping version.
jsgoupil Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/QbXml/QbXml.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Author>Jean-Sébastien Goupil</Author>
<Authors>Jean-Sébastien Goupil</Authors>
<Copyright>Copyright © Jean-Sébastien Goupil 2015-2021</Copyright>
<Version>3.0.1</Version>
<Version>3.0.2</Version>
<AssemblyName>QbSync.QbXml</AssemblyName>
<RootNamespace>QbSync.QbXml</RootNamespace>
<PackageId>QbSync.QbXml</PackageId>
Expand Down
13 changes: 8 additions & 5 deletions src/QbXml/QbXmlResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,18 @@ public IEnumerable<object> GetItemsFromResponse(string response, System.Type typ

private IEnumerable<object> SearchFor(QBXML qbXml, System.Type type)
{
foreach (var item in qbXml.Items)
if (qbXml.Items != null)
{
if (item is QBXMLMsgsRs typedItem)
foreach (var item in qbXml.Items)
{
foreach (var innerItem in typedItem.Items)
if (item is QBXMLMsgsRs typedItem && typedItem.Items != null)
{
if (innerItem.GetType() == type || type.IsAssignableFrom(innerItem.GetType()))
foreach (var innerItem in typedItem.Items)
{
yield return innerItem;
if (innerItem.GetType() == type || type.IsAssignableFrom(innerItem.GetType()))
{
yield return innerItem;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/XsdGenerator/MemberEnhancer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ private XmlSchemaElement GetSchemaElement(XmlSchemaComplexType xmlSchemaComplexT
.FirstOrDefault(m => m.QualifiedName?.Name == name);

// Let's try to search in the choices.
if (xmlSchemaElementFound == null)
if (xmlSchemaElementFound == null && xmlSchemaSequence.Items != null)
{
foreach (var choice in xmlSchemaSequence.Items.OfType<XmlSchemaChoice>())
{
Expand Down