Merge Development

README.md

@@ -30,6 +30,8 @@ Further PR's (with tests) are welcome, but please maintain backwards compatibili
 * Consistently unmarshal time.Time values as UTC ([details](https://github.com/globalsign/mgo/pull/42))
 * Enforces best practise coding guidelines ([details](https://github.com/globalsign/mgo/pull/44))
 * GetBSON correctly handles structs with both fields and pointers ([details](https://github.com/globalsign/mgo/pull/40))
+* Improved bson.Raw unmarshalling performance ([details](https://github.com/globalsign/mgo/pull/49))
+* Minimise socket connection timeouts due to excessive locking ([details](https://github.com/globalsign/mgo/pull/52))
 
 ---
 
@@ -42,6 +44,7 @@ Further PR's (with tests) are welcome, but please maintain backwards compatibili
 * @eaglerayp
 * @feliixx
 * @fmpwizard
+* @idy
 * @jameinel
 * @gazoon
 * @mapete94

bson/bson_test.go

@@ -82,6 +82,19 @@ func testUnmarshal(c *C, data string, obj interface{}) {
 	err := bson.Unmarshal([]byte(data), zero)
 	c.Assert(err, IsNil)
 	c.Assert(zero, DeepEquals, obj)
+
+	testUnmarshalRawElements(c, []byte(data))
+}
+
+func testUnmarshalRawElements(c *C, data []byte) {
+	elems := []bson.RawDocElem{}
+	err := bson.Unmarshal(data, &elems)
+	c.Assert(err, IsNil)
+	for _, elem := range elems {
+		if elem.Value.Kind == bson.ElementDocument || elem.Value.Kind == bson.ElementArray {
+			testUnmarshalRawElements(c, elem.Value.Data)
+		}
+	}
 }
 
 type testItemType struct {