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.

Sign up for GitHub

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

[FISH-1019] GlassFishProperties fix by @bhanuunrivalled #5101

Merged
merged 4 commits into from
Jan 24, 2021
Merged

[FISH-1019] GlassFishProperties fix by @bhanuunrivalled #5101

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3004619
#4657 GlassFishProperties throws NPE if the Properties is null
Sep 27, 2020
2c2fad3
Merge branch 'master' into bhan-fix
lprimak Jan 24, 2021
0ead1f7
cleanup of NPE handling
lprimak Jan 24, 2021
57cab7a
fixes suggested by @dmatej
lprimak Jan 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...mmon/simple-glassfish-api/src/main/java/org/glassfish/embeddable/GlassFishProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
// Portions Copyright [2017-2021] Payara Foundation and/or affiliates

package org.glassfish.embeddable;

import java.util.Objects;
import java.util.Properties;

/**
Expand Down Expand Up @@ -74,8 +76,10 @@ public GlassFishProperties() {
* for the plugged in {@link GlassFishRuntime} (if any)
*
* @param props Properties object which will back this GlassFishProperties object.
* @throws NullPointerException if props is null
*/
public GlassFishProperties(Properties props) {
Objects.requireNonNull(props);
lprimak marked this conversation as resolved.
Show resolved Hide resolved
gfProperties = props;
}

Expand Down