Changeset 14632

Timestamp:

2007-10-08T10:03:22+13:00 (16 years ago)

Author:

shaoqun

Message:

added synchronizing code

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/service/GS2MGRetrieve.java (modified) (4 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/GS2MGRetrieve.java

@@ -45 +45 @@
     private static final String DEFAULT_INDEX_LANGUAGE_ELEM = "defaultIndexLanguage";
     
-    private MGRetrieveWrapper mg_src = null;
-//    private MGWrapper mg_src = null;
-    
+    private static MGRetrieveWrapper mg_src = null;
     private String mg_basedir = null;
     private String mg_textdir = null;
@@ -54 +52 @@
     
     public GS2MGRetrieve () {
-        this.mg_src = new MGRetrieveWrapper ();
+    if (this.mg_src == null){
+        this.mg_src = new MGRetrieveWrapper ();
+    }
     }
     
@@ -119 +119 @@
         }
         Element content_node = this.doc.createElement (GSXML.NODE_CONTENT_ELEM);
-        
-        
+                
         String doc_content = null;
         
         //means that this.mg_src is up and running
         if (has_default_index ){
-            doc_content =  this.mg_src.getDocument (this.mg_basedir,
-            this.mg_textdir, doc_num);
+        synchronized(this.mg_src){
+                String indexpath = GSFile.collectionIndexPath(this.index_stem, this.default_index);        
+        doc_content =  this.mg_src.getDocument (this.mg_basedir,
+                            this.mg_textdir, doc_num);
+        }
         }
         
@@ -143 +145 @@
         return content_node;
         
-    }
-    
-    
+    }       
 }