Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 0cc063ebaea2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e0d1c6315aa6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 10, 2018

  1. openjdk: fix truststore-from-env patch for jdk10 

    storePropName will be jsseDefaultStore if the property isn't present, and
jsseDefaultStore is never null, so the branch to use the environment variable
would never be taken.

The env var is supposed to be preferred to jssecacerts, so we can use it as
the default in the call to System.getProperty, and use the null check to fall
back on jsseDefaultStore instead.
    @pclewis
    pclewis committed Jun 10, 2018
    Copy the full SHA
    129ea5e View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. Merge pull request #41776 from pclewis/openjdk-jdk10-truststore-from-env 

    openjdk: fix truststore-from-env patch for jdk10
    @NeQuissimus
    NeQuissimus committed Jun 11, 2018
    Copy the full SHA
    e0d1c63 View commit details
    Browse the repository at this point in the history