Changeset 38955 for main/trunk

Timestamp:

2024-04-26T11:59:41+12:00 (5 weeks ago)

Author:

kjdon

Message:

instead of synchronising on the display item list, take a copy and then use it.

Location:

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

Files:

• ServiceCluster.java (modified) (2 diffs)
• XMLCollection.java (modified) (2 diffs)

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

@@ -674 +674 @@
               Element di_list = result_doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
               description.appendChild(di_list);
-              synchronized (this.display_item_list) {
-                  DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, this.display_item_list, lang, DEFAULT_LANG, this.class_loader);
-              }
+              //synchronized (this.display_item_list) {
+              Element main_di_list_copy = (Element)result_doc.importNode(this.display_item_list, true);
+              DisplayItemUtil.addLanguageSpecificDisplayItems(di_list,/* this.display_item_list*/ main_di_list_copy, lang, DEFAULT_LANG, this.class_loader);
+                  //}
                 description.appendChild(result_doc.importNode(this.service_list, true));
                 description.appendChild(result_doc.importNode(this.metadata_list, true));
@@ -707 +708 @@
                       Element di_list = result_doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
                       description.appendChild(di_list);
-                      DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, this.display_item_list, lang, DEFAULT_LANG, this.class_loader);
+                      Element main_di_list_copy = (Element)result_doc.importNode(this.display_item_list, true);
+                      DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, /*this.display_item_list*/ main_di_list_copy, lang, DEFAULT_LANG, this.class_loader);
 
                     }

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

@@ -89 +89 @@
           Element di_list = response_doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
           description.appendChild(di_list);
-          synchronized(this.display_item_list) {
-          DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, this.display_item_list, lang, DEFAULT_LANG, this.class_loader);
-          }
+          //synchronized(this.display_item_list) {
+          Element main_di_list_copy = (Element)response_doc.importNode(this.display_item_list, true);
+          DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, /*this.display_item_list*/ main_di_list_copy, lang, DEFAULT_LANG, this.class_loader);
+          //}
         description.appendChild(response_doc.importNode(this.service_list, true));
         description.appendChild(response_doc.importNode(this.metadata_list, true));
@@ -114 +115 @@
               Element di_list = response_doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
               description.appendChild(di_list);
-              DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, this.display_item_list, lang, DEFAULT_LANG, this.class_loader);
+              Element main_di_list_copy = (Element)response_doc.importNode(this.display_item_list, true);
+              DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, /*this.display_item_list*/ main_di_list_copy, lang, DEFAULT_LANG, this.class_loader);