Changeset 9824 for branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

Timestamp:

2005-05-05T15:55:27+12:00 (19 years ago)

Author:

kjdon

Message:

when a collection (using gdbm) is opened by tomcat, windows holds a lock on the gdbm file, so you can't rebuild it. modified ModuleInterface to have a cleanUp method, so all modules need to implement this. for mg/mgpp and gdbm modules, they now unload the index data or close the connection to the database. so cleanUp should be called whenever you deactivate a module

File:

• branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java (modified) (2 diffs)

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -98 +98 @@
     this.converter = new XMLConverter();
     this.doc = this.converter.newDOM();
-    
-    
-    }
-
+    }
+
+    public void cleanUp() {
+    if (this.module_map != null) {
+        Iterator i = this.module_map.values().iterator();
+        while (i.hasNext()) {
+        ((ModuleInterface)i.next()).cleanUp();
+        }
+    }
+    }
     /** site_home must be set before configure called */
     public void setSiteHome(String home) {
@@ -807 +813 @@
 
         System.out.println("MessageRouter: deactivating "+name);
-        this.module_map.remove(name);
-
+        ModuleInterface m = (ModuleInterface)this.module_map.remove(name);
+        m.cleanUp(); // clean up any open files/connections etc - can cause trouble on windows
         // also remove the xml bit from description list
         if (type.equals(GSXML.COLLECTION_ELEM)) {