IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

#159 Possible NPE bug in URL resolver

Browse Source
This commit is contained in:
Jonathan Shook 2020-06-19 13:02:31 -05:00
parent be5928c827
commit b723924e85
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForClasspath.java
View File

@ -73,6 +73,9 @@ public class ResolverForClasspath implements ContentResolver {
@Override @Override
public List<Content<?>> resolve(URI uri) { public List<Content<?>> resolve(URI uri) {
List<Path> paths = resolvePaths(uri); List<Path> paths = resolvePaths(uri);
if (paths==null) {
return List.of();
}
List<Content<?>> contents = paths.stream().map(PathContent::new).collect(Collectors.toList()); List<Content<?>> contents = paths.stream().map(PathContent::new).collect(Collectors.toList());
return contents; return contents;

4
nb-api/src/main/java/io/nosqlbench/nb/api/content/URLContent.java
View File

@ -64,8 +64,8 @@ public class URLContent implements Content<URL> {
InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
BufferedReader bufferedReader = new BufferedReader(inputStreamReader); BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
Stream<String> lines = bufferedReader.lines(); Stream<String> lines = bufferedReader.lines();
String buffdata = lines.collect(Collectors.joining()); String buffdata = lines.map(l -> l+"\n").collect(Collectors.joining());
this.buffer = ByteBuffer.wrap(buffdata.getBytes(StandardCharsets.UTF_8)).asCharBuffer().asReadOnlyBuffer(); return CharBuffer.wrap(buffdata);
} }
return buffer; return buffer;