You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rm...@apache.org on 2018/08/18 15:15:28 UTC

[geronimo-jcache-simple] branch master updated: GERONIMO-6621 ensure default uri doesn't break the provider

This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/geronimo-jcache-simple.git


The following commit(s) were added to refs/heads/master by this push:
     new a198791  GERONIMO-6621 ensure default uri doesn't break the provider
a198791 is described below

commit a198791f9fbf550d27d975b3db3fd3be4e36bedf
Author: Romain Manni-Bucau <rm...@apache.org>
AuthorDate: Sat Aug 18 17:15:26 2018 +0200

    GERONIMO-6621 ensure default uri doesn't break the provider
---
 .../java/org/apache/geronimo/jcache/simple/SimpleManager.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/geronimo/jcache/simple/SimpleManager.java b/src/main/java/org/apache/geronimo/jcache/simple/SimpleManager.java
index 93656d3..3b05898 100644
--- a/src/main/java/org/apache/geronimo/jcache/simple/SimpleManager.java
+++ b/src/main/java/org/apache/geronimo/jcache/simple/SimpleManager.java
@@ -66,10 +66,12 @@ public class SimpleManager implements CacheManager {
         try {
             if (SimpleProvider.DEFAULT_URI.toString().equals(uri.toString()) || uri.getScheme().equals("geronimo")) {
 
-                final Enumeration<URL> resources = loader.getResources(uri.getPath());
-                do {
-                    addProperties(resources.nextElement(), props);
-                } while (resources.hasMoreElements());
+                final Enumeration<URL> resources = loader.getResources(uri.toASCIIString().substring((uri.getScheme() + "://").length()));
+                while (resources.hasMoreElements()) {
+                    do {
+                        addProperties(resources.nextElement(), props);
+                    } while (resources.hasMoreElements());
+                }
             } else {
                 props.load(uri.toURL().openStream());
             }