Merge pull request #927 from mselerin/3.8.x

fix: CompositeClassLoader does not implement getResource(String)
liquibase · Feb 21, 2020 · 586eb88 · 586eb88
2 parents 5003e26 + 248af4c
commit 586eb88
Showing 1 changed file with 29 additions and 1 deletion.
diff --git a/liquibase-core/src/main/java/liquibase/resource/CompositeResourceAccessor.java b/liquibase-core/src/main/java/liquibase/resource/CompositeResourceAccessor.java
@@ -4,6 +4,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.*;
 
 /**
@@ -95,12 +96,39 @@ public Class loadClass(String name,boolean resolve) throws ClassNotFoundExceptio
             } else {
                 throw new ClassNotFoundException(name);
             }
+        }
+
 
+        @Override
+        public URL getResource(String name) {
+            for (ClassLoader cl : classLoaders) {
+                URL url = cl.getResource(name);
+                if (url != null)
+                    return url;
+            }
 
+            // Try with the context class loader associated with the current thread.
+            return Thread.currentThread().getContextClassLoader().getResource(name);
         }
 
-
+        @Override
+        public Enumeration<URL> getResources(String name) throws IOException {
+            List<URL> urls = new ArrayList<>();
 
+            for (ClassLoader cl : classLoaders) {
+                Enumeration<URL> resources = cl.getResources(name);
+                while (resources.hasMoreElements()) {
+                    urls.add(resources.nextElement());
+                }
+            }
+
+            if (!urls.isEmpty()) {
+                return Collections.enumeration(urls);
+            }
+
+            // Try with the context class loader associated with the current thread.
+            return Thread.currentThread().getContextClassLoader().getResources(name);
+        }
     }
 
     @Override