Skip to content

Fix NPE if wrapping/copying null value #58

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix NPE if wrapping/copying null value #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c32473
Fix NPE if wrapping/copying null value
rmzzz Mar 1, 2021
904f31d
Fix travis build, since JDK8 is not default anymore.
rmzzz Mar 5, 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
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
language: java
jdk:
- openjdk8
script: mvn -f json-overlay/pom.xml test
cache:
directories:
Expand Down
7 changes: 6 additions & 1 deletion json-overlay/src/main/java/com/reprezen/jsonoverlay/ListOverlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,14 @@ private ListOverlay(JsonNode json, JsonOverlay<?> parent, OverlayFactory<List<V>

private ListOverlay(List<V> value, JsonOverlay<?> parent, OverlayFactory<List<V>> factory,
ReferenceManager refMgr) {
super(new ArrayList<>(value), parent, factory, refMgr);
super(copyValue(value), parent, factory, refMgr);
this.itemFactory = ((ListOverlayFactory<V>) factory).getItemFactory();
}
static <T> List<T> copyValue(List<T> src) {
if (src == null)
return null;
return new ArrayList<>(src);
}

@Override
protected JsonOverlay<?> _findInternal(JsonPointer path) {
Expand Down
8 changes: 7 additions & 1 deletion json-overlay/src/main/java/com/reprezen/jsonoverlay/MapOverlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,19 @@ private MapOverlay(JsonNode json, JsonOverlay<?> parent, OverlayFactory<Map<Stri

private MapOverlay(Map<String, V> value, JsonOverlay<?> parent, OverlayFactory<Map<String, V>> factory,
ReferenceManager refMgr) {
super(new LinkedHashMap<>(value), parent, factory, refMgr);
super(copyValue(value), parent, factory, refMgr);
MapOverlayFactory<V> mapOverlayFactory = (MapOverlayFactory<V>) factory;
this.valueFactory = mapOverlayFactory.getValueFactory();
String keyPattern = mapOverlayFactory.getKeyPattern();
this.keyPattern = keyPattern != null ? Pattern.compile(keyPattern) : null;
}

static <T> Map<String, T> copyValue(Map<String, T> src) {
if (src == null)
return null;
return new LinkedHashMap<>(src);
}

@Override
protected JsonOverlay<?> _findInternal(JsonPointer path) {
String key = path.getMatchingProperty();
Expand Down