/juju

state/presence: fix error handling in sync #5537

Merged
merged 1 commit into from Jun 6, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@davecheney @jujubot
@davecheney
Contributor

davecheney commented Jun 6, 2016 •
Edited 1 time

Updates LP 1588574

While investigating LP 1588574 I came across this piece of error
handling logic that was addedin back in 2012 in 93d52ed.

The logic was non sensical; if err was not nil, but was MgoNotFound then
wrap it and return it, otherwise continue on. I'm assuming that this
should actually be err was not nil and not MgoNotFound then return the
error.

(Review request: http://reviews.vapour.ws/r/4982/)
@davecheney
state/presence: fix error handling in sync 
Updates LP 1588574

While investigating LP 1588574 I came across this piece of error
handling logic that was addedin back in 2012 in 93d52ed.

The logic was non sensical; if err was not nil, but was MgoNotFound then
wrap it and return it, _otherwise_ continue on. I'm assuming that this
should actually be err was not nil and not MgoNotFound then return the
error.
fb4c59a
@davecheney
Contributor

davecheney commented Jun 6, 2016

$$JFDI$$
@jujubot
Contributor

jujubot commented Jun 6, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju
@jujubot
Contributor

jujubot commented Jun 6, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/7992
@davecheney
Contributor

davecheney commented Jun 6, 2016

$$JFDI$$
@jujubot
Contributor

jujubot commented Jun 6, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit 01fc47d into juju:master Jun 6, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment