Changes in exception handling

mongodb · Jul 20, 2011 · ac698ad · aheckmann · Jul 20, 2011 · aheckmann
1 parent 5391007
commit ac698ad
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 41 deletions.
diff --git a/lib/mongodb/admin.js b/lib/mongodb/admin.js
@@ -104,9 +104,13 @@ Admin.prototype.profilingInfo = function(callback) {
   var databaseName = this.db.databaseName;
   this.db.databaseName = 'admin';
 
-  new Cursor(this.db, new Collection(this.db, DbCommand.SYSTEM_PROFILE_COLLECTION), {}).toArray(function(err, items) {
-    return callback(err, items);
-  });
+  try {
+    new Cursor(this.db, new Collection(this.db, DbCommand.SYSTEM_PROFILE_COLLECTION), {}).toArray(function(err, items) {
+      return callback(err, items);
+    });    
+  } catch (err) {
+    return callback(err, null);
+  }
 
   self.db.databaseName = databaseName;
 };

diff --git a/lib/mongodb/db.js b/lib/mongodb/db.js
@@ -116,7 +116,7 @@ Db.prototype.collectionsInfo = function(collection_name, callback) {
     callback(null, new Cursor(this, new Collection(this, DbCommand.SYSTEM_NAMESPACE_COLLECTION), selector));
   } else {
     return new Cursor(this, new Collection(this, DbCommand.SYSTEM_NAMESPACE_COLLECTION), selector);
-  }
+  }    
 };
 
 /**
@@ -159,11 +159,19 @@ Db.prototype.collection = function(collectionName, options, callback) {
       if(collections.length == 0) {
         return callback(new Error("Collection " + collectionName + " does not exist. Currently in strict mode."), null);
       } else {
-        return callback(null, new Collection(self, collectionName, self.pkFactory, options));
+        try {
+          return callback(null, new Collection(self, collectionName, self.pkFactory, options));          
+        } catch(err) {
+          return callback(err, null);
+        }
       }
     });
   } else {
-    return callback(null, new Collection(self, collectionName, self.pkFactory, options));
+    try {
+      return callback(null, new Collection(self, collectionName, self.pkFactory, options));      
+    } catch(err) {
+      return callback(err, null);      
+    }
   }
 };
 
@@ -371,13 +379,21 @@ Db.prototype.createCollection = function(collectionName, options, callback) {
     if(found && self.strict) {
       callback(new Error("Collection " + collectionName + " already exists. Currently in strict mode."), null); return;
     } else if(found){
-      callback(null, new Collection(self, collectionName, self.pkFactory)); return;
+      try {
+        callback(null, new Collection(self, collectionName, self.pkFactory)); return;        
+      } catch(err) {
+        return callback(err, null);
+      }
     }
 
     // Create a new collection and return it
     self.executeCommand(DbCommand.createCreateCollectionCommand(self, collectionName, options), {read:false, safe:true}, function(err, result) {
       if(err == null && result.documents[0].ok == 1) {
-        callback(null, new Collection(self, collectionName, self.pkFactory));
+        try {
+          callback(null, new Collection(self, collectionName, self.pkFactory));          
+        } catch(err) {
+          return callback(err, null);
+        }
       } else {
         err != null ? callback(err, null) : callback(new Error("Error creating collection: " + collectionName), null);
       }

diff --git a/test/collection_test.js b/test/collection_test.js
@@ -319,42 +319,30 @@ var tests = testCase({
   },  
 
   shouldFailDueToIllegalCollectionNames : function(test) {
-    try {
-      client.collection(5, function(err, collection) {});      
-    } catch (err) {
+    client.collection(5, function(err, collection) {
       test.equal("collection name must be a String", err.message);
-    }
-
-    try {
-      client.collection("", function(err, collection) {});
-    } catch (err) {
+    });
+
+    client.collection("", function(err, collection) {
       test.equal("collection names cannot be empty", err.message);
-    }
-
-    try {
-      client.collection("te$t", function(err, collection) {});
-    } catch (err) {
-      test.equal("collection names must not contain '$'", err.message);
-    }
-
-    try {
-      client.collection(".test", function(err, collection) {});
-    } catch (err) {
-      test.equal("collection names must not start or end with '.'", err.message);
-    }
-
-    try {
-      client.collection("test.", function(err, collection) {});
-    } catch (err) {
-      test.equal("collection names must not start or end with '.'", err.message);
-    }
-
-    try {
-      client.collection("test..t", function(err, collection) {});  
-    } catch (err) {
+    });
+
+    client.collection("te$t", function(err, collection) {
+      test.equal("collection names must not contain '$'", err.message);        
+    });
+
+    client.collection(".test", function(err, collection) {
+      test.equal("collection names must not start or end with '.'", err.message);        
+    });
+
+    client.collection("test.", function(err, collection) {
+      test.equal("collection names must not start or end with '.'", err.message);        
+    });
+
+    client.collection("test..t", function(err, collection) {
       test.equal("collection names cannot be empty", err.message);
-      test.done();
-    }
+      test.done();        
+    });  
   },  
 
   // Test the count result on a collection that does not exist