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

JDK-8265496: improve null check in DeflaterOutputStream/InflaterInputStream #3681

Closed
wants to merge 2 commits into from

Conversation

@Hamlin-Li
Copy link

@Hamlin-Li Hamlin-Li commented Apr 26, 2021

code like below will create Deflater before null check, although it's not a real mem leak, but it's better to do null check before new Deflater.

    try {
        DeflaterOutputStream dos = new DeflaterOutputStream(null);
    } catch (NullPointerException e) {
        passed = true;
    }

Similar issues exist in several other classes.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8265496: improve null check in DeflaterOutputStream/InflaterInputStream

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3681/head:pull/3681
$ git checkout pull/3681

Update a local copy of the PR:
$ git checkout pull/3681
$ git pull https://git.openjdk.java.net/jdk pull/3681/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3681

View PR using the GUI difftool:
$ git pr show -t 3681

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3681.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 26, 2021

👋 Welcome back mli! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Apr 26, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 26, 2021

@Hamlin-Li The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs label Apr 26, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 26, 2021

Webrevs

Copy link
Contributor

@vyommani vyommani left a comment

Changes looks OK to me, did you change "DataOutputStreamTest.java" as well. I can see only copyright changes ?.

@Hamlin-Li
Copy link
Author

@Hamlin-Li Hamlin-Li commented Apr 26, 2021

It's changed by another patch sometimes ago, but I missed to update the copyright.

Copy link
Contributor

@LanceAndersen LanceAndersen left a comment

Hi Hamlin,

The change looks fine. Please add the noreg-trivial change to the issue given there is not a test update for this so that you do not get pinged by a bot

@openjdk
Copy link

@openjdk openjdk bot commented Apr 26, 2021

@Hamlin-Li This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8265496: improve null check in DeflaterOutputStream/InflaterInputStream

Reviewed-by: lancea, naoto

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 234 new commits pushed to the master branch:

  • b524a81: 8265982: JDK-8264188 breaks build on macOS-aarch64
  • efe6b93: 8265961: Fix comments in logging.properties
  • 65c19c4: 4926314: Optimize Reader.read(CharBuffer)
  • 082abbd: 8265900: Use pattern matching for instanceof at module jdk.compiler(part 2)
  • 851b219: 8265901: Use pattern matching for instanceof at module jdk.compiler(part 3)
  • fb8f0c5: 8261168: Convert javadoc tool to use Stream.toList()
  • 8559a53: 8265394: G1: Improve assert in HeapRegion::reset_not_compacted_after_full_gc
  • 68011c6: 8265928: G1: Update copyright in several files
  • 222f9f0: 8265682: G1: Mutex::_name dangling in HeapRegionRemSet references after JDK-8264146
  • 2b09ff2: 8232765: NullPointerException at Types.eraseNotNeeded() when compiling a class
  • ... and 224 more: https://git.openjdk.java.net/jdk/compare/1935655622226421797ea9109bebd4a00fe60402...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Apr 26, 2021
@naotoj
naotoj approved these changes Apr 26, 2021
@Hamlin-Li
Copy link
Author

@Hamlin-Li Hamlin-Li commented Apr 27, 2021

Hi Hamlin,

The change looks fine. Please add the noreg-trivial change to the issue given there is not a test update for this so that you do not get pinged by a bot

Hi Lance, Thanks for reminding.

@Hamlin-Li
Copy link
Author

@Hamlin-Li Hamlin-Li commented Apr 27, 2021

/integrate

@Hamlin-Li
Copy link
Author

@Hamlin-Li Hamlin-Li commented Apr 27, 2021

Thanks @LanceAndersen @naotoj @vyommani for your review.

@openjdk openjdk bot closed this Apr 27, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 27, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 27, 2021

@Hamlin-Li Since your change was applied there have been 240 commits pushed to the master branch:

  • 1d37b98: 8265972: Remove declarations with no implementations in javaClasses.hpp
  • cb29b19: 8184134: HeapRegion::LogOfHRGrainWords is unused
  • 41daa88: 8265899: Use pattern matching for instanceof at module jdk.compiler(part 1)
  • a6f2863: 8266003: ProblemList sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java on macosx-all
  • 852a41d: 8258625: [JVMCI] refactor and unify JVMCI readFieldValue path
  • b5c6351: 8264663: Update test SuspendWithCurrentThread.java to verify that suspend doesn't exit until resumed
  • b524a81: 8265982: JDK-8264188 breaks build on macOS-aarch64
  • efe6b93: 8265961: Fix comments in logging.properties
  • 65c19c4: 4926314: Optimize Reader.read(CharBuffer)
  • 082abbd: 8265900: Use pattern matching for instanceof at module jdk.compiler(part 2)
  • ... and 230 more: https://git.openjdk.java.net/jdk/compare/1935655622226421797ea9109bebd4a00fe60402...master

Your commit was automatically rebased without conflicts.

Pushed as commit 15d4787.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@Hamlin-Li Hamlin-Li deleted the Hamlin-Li:improve-null-check branch May 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants