commit 2f54ff2c5c9fbfaec77c10b7afd205d40c432a65
author Andrei Dulvac <adulvac@adobe.com> Mon Jan 21 18:25:30 2019 +0100
committer Andrei Dulvac <adulvac@adobe.com> Mon Jan 21 18:25:30 2019 +0100
tree b18f4a0c17be8a2a94be7f259aca617295d56dd7
parent 9eb041c74445f45dcbb331ecec01729d6da3f9b1

SLING-8227 [http testing clients] ResourceUtil#getResourceAsStream doesn't work on jdk 11

src/main/java/org/apache/sling/testing/clients/util/ResourceUtil.java

diff --git a/src/main/java/org/apache/sling/testing/clients/util/ResourceUtil.java b/src/main/java/org/apache/sling/testing/clients/util/ResourceUtil.java
index 6b88c53..5713ef1 100644
--- a/src/main/java/org/apache/sling/testing/clients/util/ResourceUtil.java
+++ b/src/main/java/org/apache/sling/testing/clients/util/ResourceUtil.java
@@ -31,8 +31,9 @@
      * @param resourcePath path to the resource
      * @return resource as InputStream
      */
-    public static InputStream getResourceAsStream(String resourcePath) {
-        return Thread.currentThread().getContextClassLoader().getClass().getResourceAsStream(resourcePath);
+    public static InputStream getResourceAsStream(final String resourcePath) {
+        final String path = resourcePath.startsWith("/") ? resourcePath.substring(1) : resourcePath;
+        return Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
     }
 
     /**
@@ -45,7 +46,7 @@
      *         if the requested resource cannot be resolved for some reason
      * @throws IOException if the Resource Stream cannot be read
      */
-    public static String readResourceAsString(String resource) throws IOException {
+    public static String readResourceAsString(final String resource) throws IOException {
         InputStream resourceAsStream = ResourceUtil.getResourceAsStream(resource);
         if (resourceAsStream != null) {
             StringBuilder sb = new StringBuilder();