Changeset 38954 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core

Timestamp:

2024-04-26T11:58:46+12:00 (2 months ago)

Author:

kjdon

Message:

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

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -1130 +1130 @@
 
                 if (this.display_item_list != null) {
-                    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)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);
                     return response;
-                    }
+                    //}
                 }
             }
@@ -1174 +1175 @@
 
                       if (this.display_item_list != null) {
-                          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)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);
                           
-                          }
+                          // }
                       }
                     }