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

8276050: XMLInputFactoryImpl.getProperty() returns null #8063

Closed
wants to merge 2 commits into from

Conversation

JoeWang-Java
Copy link
Member

@JoeWang-Java JoeWang-Java commented Mar 31, 2022

Fix a bug that missed checking security property manager for such properties.


Progress

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

Issue

  • JDK-8276050: XMLInputFactoryImpl.getProperty() returns null

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8063

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

Using diff file

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

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 31, 2022

👋 Welcome back joehw! 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 Pull request is ready for review label Mar 31, 2022
@openjdk
Copy link

openjdk bot commented Mar 31, 2022

@JoeWang-Java 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 core-libs-dev@openjdk.org label Mar 31, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 31, 2022

Webrevs

@@ -171,6 +171,11 @@ public Object getProperty(String property){
/** Check to see if the property is managed by the security manager **/
String propertyValue = (fSecurityManager != null) ?
fSecurityManager.getLimitAsString(property) : null;
/** Check to see if the property is managed by the security property manager **/
if (propertyValue == null){
Copy link
Member

Choose a reason for hiding this comment

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

Let's add space before {

Copy link
Member Author

Choose a reason for hiding this comment

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

Added. Also hit the format button for the class, that stirred up a hornet's nest, ended up making more (unnecessary) changes. Fortunately, it's confined to format and comments (not affecting the functionality).

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks, I didn't see the split in the commits.
IMHO for an existing class, its a bad idea to ask an IDE to reformat a whole file; just too many gratuitous changes.

Copy link
Member Author

Choose a reason for hiding this comment

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

Very true. When you look at these legacy code, it's quite tempting as you make style changes, e.g. adding a space next to more such things in the adjacent code. But yeh, must resist the urge :-)

Thanks again!

Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

It would be a big help if the style cleanup was done separately or after the
intended change was reviewed. It adds a lot of noise the the commit.
The real change is buried in there somewhere but looks ok.

@JoeWang-Java
Copy link
Member Author

It would be a big help if the style cleanup was done separately or after the intended change was reviewed. It adds a lot of noise the the commit. The real change is buried in there somewhere but looks ok.

I agree. It wasn't the original attention, normally shouldn't touch the legacy code or style. So thanks for tolerating the noise.

@JoeWang-Java
Copy link
Member Author

Review note: please note that the fix is in the initial commit. The 2nd note contain code cleanup only, no code or functional change. Sorry about the noise.

@openjdk
Copy link

openjdk bot commented Apr 1, 2022

@JoeWang-Java 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:

8276050: XMLInputFactoryImpl.getProperty() returns null

Reviewed-by: rriggs

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 13 new commits pushed to the master branch:

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 Pull request is ready to be integrated label Apr 1, 2022
@JoeWang-Java
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 4, 2022

Going to push as commit 61d06c2.
Since your change was applied there have been 24 commits pushed to the master branch:

  • 7381868: 8283623: Create an automated regression test for JDK-4525475
  • f76f5da: 5087440: java.io bulk read(...) end-of-stream return value descriptions ambiguous
  • 36b9baa: 8282508: Updating ASM to 9.2 for JDK 19
  • 4e20a03: 8283044: Use asynchronous handshakes to deliver asynchronous exceptions
  • 9d200d6: 8282756: Make ElementKind checks more specific
  • 1012d59: 8281079: [s390] Unify Address Operand Encoding in Instruction Emitters
  • 003ec21: 8279508: Auto-vectorize Math.round API
  • c1e67b6: 8283474: Include detailed heap object info in CDS map file
  • 060a188: 8283865: riscv: Break down -XX:+UseRVB into seperate options for each bitmanip extension
  • e5e1aab: 8284068: riscv: should call Atomic::release_store in JavaThread::set_thread_state
  • ... and 14 more: https://git.openjdk.java.net/jdk/compare/ad83ec7e281cb3ab7c42e71fab47ea21b93079ea...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 4, 2022
@openjdk openjdk bot closed this Apr 4, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 4, 2022
@openjdk
Copy link

openjdk bot commented Apr 4, 2022

@JoeWang-Java Pushed as commit 61d06c2.

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

@JoeWang-Java JoeWang-Java deleted the JDK-8276050 branch April 5, 2022 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

3 participants