Changeset 16251

Timestamp:

2008-06-30T15:08:32+12:00 (16 years ago)

Author:

ak19

Message:

Fixed erroneous use of Debug instead of DebugStream in previous commit, moved some general code out of if clause that checks that greenstone is not remote in loadCollectionInternal()

File:

• gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -1233 +1233 @@
             
         } catch (IOException ioe) {
-            Debug.printStackTrace(ioe);
+            DebugStream.printStackTrace(ioe);
         }
         
@@ -1261 +1261 @@
             bor.close();
             } catch (IOException ioe) {  
-            Debug.printStackTrace(ioe);
+            DebugStream.printStackTrace(ioe);
             }  
             
@@ -1269 +1269 @@
             new_collection_file.renameTo(collection_file); 
             } catch (Exception e) { 
-            Debug.printStackTrace(ioe);
+            DebugStream.printStackTrace(e);
             } 
         }
-        
-        // Open the collection file
-        this.collection = new Collection(collection_file);
-        if (collection.error) {
-            collection = null;
-            // Remove lock file
-            if (lock_file.exists()) {
-            lock_file.delete();
-            }
-            throw(new Exception(Dictionary.get("CollectionManager.Missing_Config"))); // this error message does not agree with the error
-        }
-        
+        }
+        
+        // Open the collection file
+        this.collection = new Collection(collection_file);
+        if (collection.error) {
+        collection = null;
+        // Remove lock file
+        if (lock_file.exists()) {
+            lock_file.delete();
+        }
+        throw(new Exception(Dictionary.get("CollectionManager.Missing_Config"))); // this error message does not agree with the error
+        }
+        
+        if (!Gatherer.isGsdlRemote) {
         scheduling();
         }