Changeset 21312 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

Timestamp:

2009-12-09T15:28:39+13:00 (14 years ago)

Author:

kjdon

Message:

a little bit of code rearranging and editing so that we can have a serviceRackList in collectionConfig.xml (as well as buildConfig.xml) - may want to manually specify one and not have to edit the file each time after a rebuild

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -205 +205 @@
     
     // do the service racks
+    // empty the service map in case this is a reconfigure
+    clearServices();
     Element service_rack_list = (Element)GSXML.getChildByTagName(service_cluster_info, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
     if (service_rack_list == null) {
@@ -274 +276 @@
     return true;
     }
-    
+
+    
+  protected void clearServices() {
+    service_map.clear();
+    this.service_list = this.doc.createElement(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
+  }
     /** creates and configures all the services - extra_info is some more xml 
 that is passed to teh service  - eg used for coll config files for Collection
@@ -280 +287 @@
     protected boolean configureServiceRack(Element service_rack_list, 
                        Element extra_info) {
-
-    // empty the service map in case this is a reconfigure
-    service_map.clear();
-    this.service_list = this.doc.createElement(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
 
     // create all the services
@@ -607 +610 @@
     if (subset.equals(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER)) {
         Element service_rack_list = (Element)GSXML.getChildByTagName(cluster_config_elem, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
-        
+        clearServices();
         return configureServiceRack(service_rack_list, null);
     } else if (subset.equals(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER)) {