From b723924e85586c7a4352f8c51169be9cb426b950 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 19 Jun 2020 13:02:31 -0500
Subject: [PATCH] #159 Possible NPE bug in URL resolver

---
 .../io/nosqlbench/nb/api/content/ResolverForClasspath.java    | 3 +++
 .../main/java/io/nosqlbench/nb/api/content/URLContent.java    | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForClasspath.java b/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForClasspath.java
index 6f10231b3..8bfb47eb1 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForClasspath.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForClasspath.java
@@ -73,6 +73,9 @@ public class ResolverForClasspath implements ContentResolver {
     @Override
     public List<Content<?>> resolve(URI uri) {
         List<Path> paths = resolvePaths(uri);
+        if (paths==null) {
+            return List.of();
+        }
         List<Content<?>> contents = paths.stream().map(PathContent::new).collect(Collectors.toList());
         return contents;
 
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/content/URLContent.java b/nb-api/src/main/java/io/nosqlbench/nb/api/content/URLContent.java
index fd2897c76..952da2eb0 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/content/URLContent.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/content/URLContent.java
@@ -64,8 +64,8 @@ public class URLContent implements Content<URL> {
             InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
             BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
             Stream<String> lines = bufferedReader.lines();
-            String buffdata = lines.collect(Collectors.joining());
-            this.buffer = ByteBuffer.wrap(buffdata.getBytes(StandardCharsets.UTF_8)).asCharBuffer().asReadOnlyBuffer();
+            String buffdata = lines.map(l -> l+"\n").collect(Collectors.joining());
+            return CharBuffer.wrap(buffdata);
         }
 
         return buffer;