Skip to content

Conversation

@peterrsongg
Copy link
Contributor

@peterrsongg peterrsongg commented Apr 5, 2024

Description

This PR fixes DOTNET-7357 issue 33. Issue 33 Issue unmarshalling Xml Responses due to improper handling of "LocationName"

  • (Review manual changes) commit 6f05ab0 - Fixes for issue 33.
  • (Reference generated changes) commit 443a620 - Generated changes for issue 33.

MERGE into protocol-tests feature branch only

Builds on prior PR: #3266
Merge order: 112 (I'm going to start mine from 100 and increment to keep separate from Bo's)
Ticket: DOTNET-7357

Motivation and Context

Testing

N/A - the test cases are the protocol tests. A final dry-run will be done on the protocol-tests feature branch once everything is merged into the feature branch.

Screenshots (if appropriate)

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • My code follows the code style of this project
  • My change requires a change to the documentation
  • I have updated the documentation accordingly
  • I have read the README document
  • I have added tests to cover my changes
  • All new and existing tests passed

License

  • I confirm that this pull request can be released under the Apache 2 license

@peterrsongg peterrsongg requested a review from boblodgett April 5, 2024 01:22
return locationName.ToString();
}
var memberTarget = member.Shape.data[ServiceModel.LocationNameKey];
if(member.Shape.data != null && memberTarget != null)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

member.Shape.data != null doesn't seem needed as you would have referenced a location in a null json object previously and that would have failed. Does the check need to be moved or removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right, Member.Shape.data would never actually return null I removed it

@peterrsongg
Copy link
Contributor Author

There are some additional generated changes that snuck in there. These are files that I didn't push in a different commit. You can ignore those. Once we merge all these in we are going to have to run the generator again anyways.

@peterrsongg peterrsongg merged commit 24e1222 into protocol-tests Apr 8, 2024
@peterrsongg peterrsongg deleted the protocol-tests-issue-33 branch April 8, 2024 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants