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.

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

Fix issue 158 #159

Merged
merged 3 commits into from
Apr 17, 2013
Merged

Fix issue 158 #159

merged 3 commits into from
Apr 17, 2013

Conversation

krkeegan
Copy link
Collaborator

@krkeegan krkeegan commented Apr 6, 2013

Fixes the problem where the read buffer was cleared whenever a NACK busy message was present. This patch will trim the leading "15" byte(s) and if anything remains it will push it into the fragment for the next read.

Fixes #158

This pull intentionally relies on pull request #155. Since adjacent code was changed, pull request #155 should be merged first and then this request. I apologize that it makes this pull request more difficult to read. The only additional change is the last commit, so if you review those changes it will be easier to understand.

krkeegan added 3 commits April 5, 2013 17:12
The PLM may report a busy code 15, even when there is no active_message.  Added logic to test for an active message before trying to resend it.

Partial fix for issue hollie#154
…tive Message

I am not clear how this could be occuring, but it was reported as a crash.  Added simple logic to test for an active_message before trying to call the active message.

Fixes Issue hollie#154
Solves issue hollie#158 identified by Chris Dragon

This will trim the leading "15" bytes from the data.  If anything is left it will be placed into the message fragment to be read next time.
krkeegan added a commit that referenced this pull request Apr 17, 2013
@krkeegan krkeegan merged commit 25d82e7 into hollie:master Apr 17, 2013
@hollie hollie mentioned this pull request Jun 15, 2013
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.

1 participant