Skip to content
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

Jump to bottom

Fixed file manager race condition #1277

Merged
merged 2 commits into from May 28, 2019
Merged

Fixed file manager race condition #1277

merged 2 commits into from May 28, 2019

Conversation

NicoleYarroch
Copy link
Contributor

@NicoleYarroch NicoleYarroch commented May 23, 2019 •
edited

Fixes #1264

This PR is ready for review.

Risk

This PR makes no API changes.

Testing Plan

  • Unit tests added

Summary

  • Fixed the file manager adding file uploads to the transaction queue after the file manager transitioned to state shutdown. The operation would never finish so any uploads added after the file manager transitioned back to the ready state would not run.

Changelog

Breaking Changes
  • n/a
Bug Fixes
  • Fixed the file manager adding file uploads to the transaction queue after the file manager has shutdown.

CLA

@NicoleYarroch
Fixed the file manager race condition
25f8f76 
Fixed the file manager adding operations to the queue after shutdown
@NicoleYarroch NicoleYarroch added the bug A defect in the library label May 23, 2019
@NicoleYarroch NicoleYarroch self-assigned this May 23, 2019
@NicoleYarroch NicoleYarroch added this to In progress in v6.3 via automation May 23, 2019
@NicoleYarroch NicoleYarroch changed the base branch from master to develop May 23, 2019 20:12
@NicoleYarroch NicoleYarroch mentioned this pull request May 23, 2019
Closed
@NicoleYarroch NicoleYarroch changed the title Bugfix/issue 1264 file manager race condition Fixed file manager race condition May 23, 2019
joeljfischer
joeljfischer suggested changes May 28, 2019
View reviewed changes
Copy link
Contributor

@joeljfischer joeljfischer left a comment

Choose a reason for hiding this comment

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

Just minor changes

SmartDeviceLink/SDLFileManager.m Outdated Show resolved Hide resolved
SmartDeviceLink/SDLFileManager.m Outdated Show resolved Hide resolved
SmartDeviceLink/SDLFileManager.m Outdated Show resolved Hide resolved
v6.3 automation moved this from In progress to Review in progress May 28, 2019
v6.3 automation moved this from Review in progress to Reviewer approved May 28, 2019
@joeljfischer joeljfischer merged commit 7f0f28f into develop May 28, 2019
v6.3 automation moved this from Reviewer approved to Done May 28, 2019
@joeljfischer joeljfischer deleted the bugfix/issue_1264_file_manager_race_condition branch May 28, 2019 21:52
@joeljfischer joeljfischer added this to the 6.3.0 milestone May 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joeljfischer joeljfischer joeljfischer approved these changes

Assignees

@NicoleYarroch NicoleYarroch

Labels
bug A defect in the library
Projects
No open projects
v6.3
  
Done
Milestone
6.3.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@NicoleYarroch @joeljfischer