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

Fix NullPointerException with external tor usage #4365

Merged
merged 1 commit into from
Jul 23, 2020
Merged

Fix NullPointerException with external tor usage #4365

merged 1 commit into from
Jul 23, 2020

Conversation

ddawson
Copy link
Contributor

@ddawson ddawson commented Jul 9, 2020

If torControlPort is specified, but neither torControlPassword nor torControlCookieFile are specified, we have cookieFile == null in bisq.network.p2p.network.RunningTor, but RunningTor.getTor() assumes a cookie file has been specified and tries to check that the file exists, causing the thread to crash. Added a check for null to fix this.

@ddawson
Fix NullPointerException with external tor usage
8c526d4 
If torControlPort is specified, but neither torControlPassword nor
torControlCookieFile are specified, we have cookieFile == null in
bisq.network.p2p.network.RunningTor, but RunningTor.getTor() assumes a
cookie file has been specified and tries to check that the file exists,
causing the thread to crash. Added a check for null to fix this.
@boring-cyborg
Copy link

boring-cyborg bot commented Jul 9, 2020

Thanks for opening this pull request!

Please check out our contributor checklist and check if Travis or Codacy found any issues with your PR. Also make sure your commits are signed, and that you applied Bisq's code style and formatting.

A maintainer will add an is:priority label to your PR if it is up for compensation. Please see our Bisq Q1 2020 Update post for more details.

mrosseel
mrosseel approved these changes Jul 9, 2020
View reviewed changes
Copy link
Member

@mrosseel mrosseel left a comment

Choose a reason for hiding this comment

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

utAck

ripcurlx
ripcurlx approved these changes Jul 23, 2020
View reviewed changes
Copy link
Contributor

@ripcurlx ripcurlx left a comment

Choose a reason for hiding this comment

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

utACK

@ripcurlx ripcurlx merged commit efe346a into bisq-network:master Jul 23, 2020
@boring-cyborg
Copy link

boring-cyborg bot commented Jul 23, 2020

Awesome work, congrats on your first merged pull request!

@ddawson ddawson deleted the ext-tor-nullptr branch July 23, 2020 16:42
@ddawson ddawson restored the ext-tor-nullptr branch July 23, 2020 16:44
@ddawson ddawson deleted the ext-tor-nullptr branch July 23, 2020 16:47
@ripcurlx ripcurlx added this to the v1.3.7 milestone Jul 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ripcurlx ripcurlx ripcurlx approved these changes

@mrosseel mrosseel mrosseel approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.3.7
Development

Successfully merging this pull request may close these issues.
3 participants
@ddawson @ripcurlx @mrosseel