Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

79015bc5

Commit 79015bc5 authored 7 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '1042-catch-npe-when-getting-socket-streams' into 'master'

Catch NPE when getting socket input/output streams

Closes #1042

See merge request !589

parents abcb6824 27422ab9

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorTransportConnection.java 3 additions, 2 deletions

...iarproject/bramble/plugin/tor/TorTransportConnection.java
bramble-api/src/main/java/org/briarproject/bramble/util/IoUtils.java 21 additions, 0 deletions

.../src/main/java/org/briarproject/bramble/util/IoUtils.java
bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpTransportConnection.java 3 additions, 2 deletions

...iarproject/bramble/plugin/tcp/TcpTransportConnection.java
bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReportServer.java 2 additions, 1 deletion

...a/org/briarproject/bramble/reporting/DevReportServer.java
bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReporterImpl.java 1 addition, 1 deletion

...a/org/briarproject/bramble/reporting/DevReporterImpl.java
bramble-core/src/main/java/org/briarproject/bramble/socks/SocksSocket.java 2 additions, 2 deletions

...main/java/org/briarproject/bramble/socks/SocksSocket.java

with 32 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment