Changeset 10869

Timestamp:

2005-11-08T13:27:35+13:00 (18 years ago)

Author:

kjdon

Message:

check the result of trying to open the test db, and print an error if unsuccessful

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/CollectionManager.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/CollectionManager.java

@@ -183 +183 @@
     */
     if (this.database == null) {
-      this.database = GS3SQLConnectionFactory.getGS3SQLConnection("test");
-      boolean success = this.database.initCollection(this.qualifiedCollectionName);
-      if (!success) {
-          System.err.println("couldn't init collection " + this.qualifiedCollectionName);
-          System.exit(1);
-      }
+    this.database = GS3SQLConnectionFactory.getGS3SQLConnection("test");
+    if (this.database == null) {
+        System.err.println("Can't connect to the mysql database. Please make sure your mysql is running, and that the correct passwords (if any) are specified in "+gsdl3Root+"/WEB-INF/classes/global.properties");
+        System.exit(1);
+    }
+    boolean success = this.database.initCollection(this.qualifiedCollectionName);
+    if (!success) {
+        System.err.println("couldn't init collection " + this.qualifiedCollectionName);
+        System.exit(1);
+    }
     }