Changeset 26264 for main/trunk

Timestamp:

2012-09-27T13:57:02+12:00 (12 years ago)

Author:

kjdon

Message:

changed findResource to getResource to make it a child:parent classloader rather than a parent first classloader

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/CollectionClassLoader.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/CollectionClassLoader.java

@@ -38 +38 @@
         this.base_dir = GSFile.collectionResourceDir(site_home, collection_name);
     }
-
-    public URL findResource(String name)
+  
+  // Resource Bundle loading with a class loader will call getResource(). 
+  // THe Java implementation of getResource tries using the parent class 
+  // loader to find the resource (or the system class loader if no parent). 
+  // If the resource not found, then it calls the local findResource method. 
+  // Ie parent:child ordering.
+  // Because we want local files to override default ones, we need 
+  // child:parent ordering, so change getResource to look locally first.
+  //public URL findResource(String name)
+    public URL getResource(String name)
     {
         File resource_path = new File(this.base_dir, name);
@@ -53 +61 @@
         }
 
-        return super.findResource(name);
+        return super.getResource(name);
     }
 }