Merge remote branch 'nw/master'

christkv · Jun 17, 2010 · f2d9b8f · f2d9b8f
2 parents a1a74ff + d8bf321
commit f2d9b8f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/integration/integration_tests.js b/integration/integration_tests.js
@@ -3334,6 +3334,18 @@ var all_tests = {
     });
   },
 
+  test_find_one_error_handling : function() {
+    client.createCollection('test_find_one_error_handling', function(err, collection) {    
+      // Try to fetch an object using a totally invalid and wrong hex string... what we're interested in here
+      // is the error handling of the findOne Method     
+      try {
+        collection.findOne({"_id":ObjectID.createFromHexString('5e9bd59248305adf18ebc15703a1')}, function(err, result) {});      
+      } catch (err) {
+        finished_test({test_find_one_error_handling:'ok'});      
+      }
+    });  
+  },
+
   // test_force_binary_error : function() {
   //   client.createCollection('test_force_binary_error', function(err, collection) {    
   //     // Try to fetch an object using a totally invalid and wrong hex string... what we're interested in here
@@ -3621,6 +3633,7 @@ function run_tests() {
   });
 }
 
+
 function finished_test(test_object) {
   for(var name in test_object) {
     sys.puts("= executing test: " + name + " [" + test_object[name] + "]");

diff --git a/lib/mongodb/bson/bson.js b/lib/mongodb/bson/bson.js
@@ -483,7 +483,9 @@ var Code = exports.Code = function(code, scope) {
   Object ID used to create object id's for the mongo requests
 **/
 var ObjectID = exports.ObjectID = function(id) {
-  id == null ? this.id = this.generate() : this.id = id;
+  if(id == null) this.id = this.generate();
+  else if( /^[0-9a-fA-F]{24}$/.test(id)) return ObjectID.createFromHexString(id);
+  else this.id = id;
 };
 
 ObjectID.prototype.get_inc = function() {