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 for issue 539, adds atomic operation for changing wallet encryption key and password. #295

Merged
merged 1 commit into from
Dec 16, 2014

Conversation

wlk
Copy link
Contributor

@wlk wlk commented Dec 12, 2014

This is a fix for https://code.google.com/p/bitcoinj/issues/detail?id=539

Please verify if I'm using correct lock. Two options are: lock or keychainLock

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.04%) when pulling 01149d7 on wlk:issue-539 into 4e31366 on bitcoinj:master.

@mikehearn
Copy link
Member

Yes that's the right lock, but you need to use a try/finally so the lock isn't held permanently if an exception is thrown.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling ba58664 on wlk:issue-539 into 4e31366 on bitcoinj:master.

@wlk
Copy link
Contributor Author

wlk commented Dec 13, 2014

Fixed

@schildbach
Copy link
Member

Can you fix the formatting? Space between "try" and "{", and no newline between "}" and "finally".

@wlk
Copy link
Contributor Author

wlk commented Dec 13, 2014

Formatting fixed.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) when pulling bc24661 on wlk:issue-539 into 4e31366 on bitcoinj:master.

@mikehearn
Copy link
Member

Looks good to me!

@schildbach schildbach merged commit bc24661 into bitcoinj:master Dec 16, 2014
@schildbach
Copy link
Member

Merged, thanks!

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.

4 participants