Skip to content
This repository was archived by the owner on Sep 26, 2023. It is now read-only.

fix: prevent npe caused by missing parentheses#1198

Merged
elharo merged 2 commits intogoogleapis:masterfrom
Gerschtli:fix-npe
Oct 12, 2020
Merged

fix: prevent npe caused by missing parentheses#1198
elharo merged 2 commits intogoogleapis:masterfrom
Gerschtli:fix-npe

Conversation

@Gerschtli
Copy link
Contributor

@Gerschtli Gerschtli commented Oct 2, 2020 •
edited
Loading

Currently I can't set the log level lower than FINER because this library throws a NPE. The cause of this problem is a missing pair of parentheses.

This is the current snippet:

"enclosingMethod: " + callable.getClass().getEnclosingMethod() != null
  ? callable.getClass().getEnclosingMethod().getName()
  : ""

Which is equivalent to:

("enclosingMethod: " + callable.getClass().getEnclosingMethod()) != null
  ? callable.getClass().getEnclosingMethod().getName()
  : ""

This results in calling callable.getClass().getEnclosingMethod().getName() even if callable.getClass().getEnclosingMethod() is null.

Fixes #1198.

@Gerschtli Gerschtli requested a review from a team October 2, 2020 12:34
@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Oct 2, 2020
@codecov
Copy link

codecov bot commented Oct 2, 2020 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@88328eb). Click here to learn what that means.
The diff coverage is 66.66%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #1198   +/-   ##
=========================================
  Coverage          ?   79.18%           
  Complexity        ?     1199           
=========================================
  Files             ?      205           
  Lines             ?     5270           
  Branches          ?      436           
=========================================
  Hits              ?     4173           
  Misses            ?      924           
  Partials          ?      173
Impacted Files Coverage Δ Complexity Δ
...m/google/api/gax/retrying/BasicRetryingFuture.java 93.13% <66.66%> (ø) 25.00 <0.00> (?)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 88328eb...783d53f. Read the comment docs.

elharo
elharo reviewed Oct 5, 2020
View reviewed changes
Copy link
Contributor

@elharo elharo left a comment

Choose a reason for hiding this comment

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

Looks good. This could use an issue and a test.

@Gerschtli
Copy link
Contributor Author

Gerschtli commented Oct 5, 2020

@elharo Hey, thank you for your feedback!

I can create an issue for this PR in a bit. For the tests: Unfortunately I don't understand what is going on in this class (and what it is for) so it would cost me several hours to set up a working test case for it (AFAICT there aren't any tests for this class yet). I think that would not be worth it. What do you think?

elharo
elharo reviewed Oct 5, 2020
View reviewed changes
Copy link
Contributor

@elharo elharo left a comment

Choose a reason for hiding this comment

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

"Fixes" without tests are too risky. If you don't have the time to write a test, please file an issue and close this PR. We'll triage and get to it when we can.

@Gerschtli Gerschtli mentioned this pull request Oct 5, 2020
Closed
@Gerschtli Gerschtli force-pushed the fix-npe branch 2 times, most recently from b1390bc to af11f2d Compare October 5, 2020 22:10
@Gerschtli
Copy link
Contributor Author

Gerschtli commented Oct 5, 2020

Created an issue and a basic minimal test case for my fix. PTAL

@elharo elharo merged commit b856351 into googleapis:master Oct 12, 2020
@Gerschtli Gerschtli deleted the fix-npe branch October 12, 2020 16:25
gcf-merge-on-green bot pushed a commit that referenced this pull request Oct 19, 2020
@release-please
chore: release 1.60.0 (#1213)
a8b4b87 
🤖 I have created a release \*beep\* \*boop\* 
---
## [1.60.0](https://www.github.com/googleapis/gax-java/compare/v1.59.1...v1.60.0) (2020-10-19)


### Features

* REST Gapic (REGAPIC) Support  ([#1177](https://www.github.com/googleapis/gax-java/issues/1177)) ([12b18ee](https://www.github.com/googleapis/gax-java/commit/12b18ee255d3fabe13bb3969df40753b29f830d5))


### Bug Fixes

* prevent npe caused by missing parentheses ([#1198](https://www.github.com/googleapis/gax-java/issues/1198)) ([b856351](https://www.github.com/googleapis/gax-java/commit/b85635123f987f9808086f14a58dd8c7418a3bd8))


### Dependencies

* upgrade grpc to 1.32.2 ([#1212](https://www.github.com/googleapis/gax-java/issues/1212)) ([03c4c0f](https://www.github.com/googleapis/gax-java/commit/03c4c0f621f439c30752122568d2a9a7703e5e16))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@elharo elharo elharo approved these changes

@miraleung miraleung miraleung approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Gerschtli @elharo @miraleung