Changeset 36985

Timestamp:

2022-12-07T13:54:29+13:00 (12 months ago)

Author:

kjdon

Message:

the custom class loader now uses site resources file if no cluster_name is set - ie its a site-wide service, not a collection-specific service.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -208 +208 @@
     public boolean configure(Element info, Element extra_info)
     {
-        // set up the class loader
-      // this needs modifying if we ever have serviceracks at siteconfig level that want to use class loader
-      this.class_loader = new CustomClassLoader(this.getClass().getClassLoader(), GSFile.collectionResourceDir(this.site_home, this.cluster_name));
-        return true;
+          // set up the class loader
+          // are we in a collection?
+          if (this.cluster_name != null) {
+            this.class_loader = new CustomClassLoader(this.getClass().getClassLoader(), GSFile.collectionResourceDir(this.site_home, this.cluster_name));
+            return true;
+          }
+          // we are at site level
+          this.class_loader = new CustomClassLoader(this.getClass().getClassLoader(), GSFile.siteResourceDir(this.site_home));
+          return true;
     }